trafficcue/planetiler-openmaptiles
1
0
Fork 0
mirror of https://github.com/cfpwastaken/planetiler-openmaptiles.git synced 2026-02-04 20:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set feature IDs in boundary and agg_stop features. (#148)

Browse Source
This commit is contained in:
Michael Barry
2024-01-15 11:54:51 -05:00
committed by GitHub
parent 1e60f45639
commit f038d69af1
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/openmaptiles/layers/Boundary.java
View File

@@ -269,6 +269,7 @@ public class Boundary implements
// save for later
try {
CountryBoundaryComponent component = new CountryBoundaryComponent(
feature.id(),
minAdminLevel,
disputed,
maritime,
@@ -323,7 +324,7 @@ public class Boundary implements
if (merged instanceof LineString lineString) {
BorderingRegions borderingRegions = getBorderingRegions(countryBoundaries, key.regions, lineString);
var features = featureCollectors.get(SimpleFeature.fromWorldGeometry(lineString));
var features = featureCollectors.get(SimpleFeature.fromWorldGeometry(lineString, key.id));
var newFeature = features.line(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
.setAttr(Fields.ADMIN_LEVEL, key.adminLevel)
.setAttr(Fields.DISPUTED, key.disputed ? 1 : 0)
@@ -471,6 +472,7 @@ public class Boundary implements
* Information to hold onto from processing a way in a boundary relation to determine the left/right region ID later.
*/
private record CountryBoundaryComponent(
long id,
int adminLevel,
boolean disputed,
boolean maritime,
@@ -482,7 +484,7 @@ public class Boundary implements
) {
CountryBoundaryComponent groupingKey() {
return new CountryBoundaryComponent(adminLevel, disputed, maritime, minzoom, null, regions, claimedBy, name);
return new CountryBoundaryComponent(id, adminLevel, disputed, maritime, minzoom, null, regions, claimedBy, name);
}
}
}

7
src/main/java/org/openmaptiles/layers/Poi.java
View File

@@ -176,7 +176,8 @@ public class Poi implements
private void processAggStop(Tables.OsmPoiPoint element, FeatureCollector.Factory featureCollectors,
Consumer<FeatureCollector.Feature> emit, Integer aggStop) {
try {
var features = featureCollectors.get(SimpleFeature.fromWorldGeometry(element.source().worldGeometry()));
var features =
featureCollectors.get(SimpleFeature.fromWorldGeometry(element.source().worldGeometry(), element.source().id()));
setupPoiFeature(element, features.point(LAYER_NAME), aggStop);
for (var feature : features) {
emit.accept(feature);
@@ -209,7 +210,6 @@ public class Poi implements
processAggStop(aggStopSet.getFirst(), featureCollectors, emit, 1);
continue;
}
Tables.OsmPoiPoint nearest = null;
try {
// find most important stops based on subclass
@@ -228,7 +228,8 @@ public class Poi implements
double minDistance = Double.MAX_VALUE;
for (var aggStop : topAggStops) {
double distance = aggStopCentroid.distance(aggStop.source().worldGeometry());
if (distance < minDistance) {
if (distance < minDistance || nearest == null ||
(distance == minDistance && aggStop.source().id() < nearest.source().id())) {
minDistance = distance;
nearest = aggStop;
}