Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate Locale independent IDs #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generate Locale independent IDs #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/io/sharedstreets/data/SharedStreetsGeometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.Formatter;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;


Expand Down Expand Up @@ -106,15 +108,16 @@ public Set<TileId> getTileKeys(int zLevel) {

// generate a stable ref
public static UniqueId generateId(SharedStreetsGeometry ssg) {
String hashString = new String();
StringBuilder hashString = new StringBuilder();
Formatter formatter = new Formatter((Locale) null);

hashString = "Geometry";
hashString.append("Geometry");

for(int i = 0; i < ((Polyline)ssg.geometry).getPointCount(); i++) {
hashString += String.format(" %.5f %.5f", ((Polyline)ssg.geometry).getPoint(i).getX(), ((Polyline)ssg.geometry).getPoint(i).getY());
hashString.append(formatter.format(" %.5f %.5f", ((Polyline)ssg.geometry).getPoint(i).getX(), ((Polyline)ssg.geometry).getPoint(i).getY()));
}

return UniqueId.generateHash(hashString);
return UniqueId.generateHash(hashString.toString());
}

}
5 changes: 2 additions & 3 deletions src/main/java/io/sharedstreets/data/SharedStreetsIntersection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.io.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;

public class SharedStreetsIntersection extends TilableData implements Comparable, Serializable {
Expand Down Expand Up @@ -44,9 +45,7 @@ public Set<TileId> getTileKeys(int zLevel) {

public static UniqueId generateId(SharedStreetsIntersection ssi) {

String hashString = new String();

hashString = String.format("Intersection %.5f %.5f", ssi.point.getX(), ssi.point.getY());
String hashString = String.format((Locale) null, "Intersection %.5f %.5f", ssi.point.getX(), ssi.point.getY());

// synthetic LPRs don't have node IDs...
if(ssi.osmNodeId != null)
Expand Down
18 changes: 10 additions & 8 deletions src/main/java/io/sharedstreets/data/SharedStreetsReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import com.esri.core.geometry.Point;
import com.esri.core.geometry.Polyline;
import com.google.protobuf.ByteString;
import com.google.protobuf.Int32Value;
import com.jsoniter.annotation.JsonIgnore;
import io.sharedstreets.data.output.proto.SharedStreetsProto;
import io.sharedstreets.tools.builder.osm.model.Way;
Expand All @@ -20,8 +18,10 @@
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Formatter;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;

public class SharedStreetsReference extends TilableData implements Serializable {
Expand Down Expand Up @@ -329,18 +329,20 @@ else if(roadClass == Way.ROAD_CLASS.ClassTrunk ||

// generate a stable ref
public static UniqueId generateId(SharedStreetsReference ssr) {
String hashString = new String();
StringBuilder hashString = new StringBuilder();
Formatter formatter = new Formatter((Locale) null);

hashString = "Reference " + ssr.formOfWay.value;
hashString.append("Reference ").append(ssr.formOfWay.value);

for(SharedStreetsLocationReference lr : ssr.locationReferences) {
hashString += String.format(" %.5f %.5f", lr.point.getX(), lr.point.getY());
hashString.append(formatter.format(" %.5f %.5f", lr.point.getX(), lr.point.getY()));
if(lr.outboundBearing != null) {
hashString += String.format(" %d", Math.round(lr.outboundBearing));
hashString += String.format(" %d", Math.round(lr.distanceToNextRef)); // hash of distance to next ref in meters -- stored in centimeters
hashString.append(formatter.format(" %d", Math.round(lr.outboundBearing)));
// Really stored in centimeters? Formerly distanceToNextRef was multiplied by 100, but not any longer...
hashString.append(formatter.format(" %d", Math.round(lr.distanceToNextRef))); // hash of distance to next ref in meters -- stored in centimeters
}
}
UniqueId id = UniqueId.generateHash(hashString);
UniqueId id = UniqueId.generateHash(hashString.toString());

return id;
}
Expand Down