[Git][debian-gis-team/mkgmap][upstream] New upstream version 0.0.0+svn4912

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mkgmap


Commits:
1ca07776 by Bas Couwenberg at 2023-10-01T07:11:59+02:00
New upstream version 0.0.0+svn4912
- - - - -


5 changed files:

- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/general/MapRoad.java
- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
- src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberGenerator.java
- src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberRoad.java


Changes:

=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4910
-build.timestamp: 2023-07-16T04:36:29+0100
+svn.version: 4912
+build.timestamp: 2023-09-18T09:52:51+0100


=====================================
src/uk/me/parabola/mkgmap/general/MapRoad.java
=====================================
@@ -43,6 +43,7 @@ public class MapRoad extends MapLine {
 	private boolean segmentsFollowing;
 	private boolean skipHousenumberProcessing;
 	private boolean namedByHousenumberProcessing;
+	private boolean namedByIdentifyServiceRoad;
 	private final int roadId;
 	
 	public MapRoad(int roadId, long OSMid, MapLine line) {
@@ -164,6 +165,20 @@ public class MapRoad extends MapLine {
 		this.namedByHousenumberProcessing = namedByHousenumberProcessing;
 	}
 
+	/**
+	 * @return the namedByIdentifyServiceRoad
+	 */
+	public boolean isNamedByIdentifyServiceRoad() {
+		return namedByIdentifyServiceRoad;
+	}
+
+	/**
+	 * @param namedByIdentifyServiceRoad the namedByIdentifyServiceRoad to set
+	 */
+	public void setNamedByIdentifyServiceRoad(boolean namedByIdentifyServiceRoad) {
+		this.namedByIdentifyServiceRoad = namedByIdentifyServiceRoad;
+	}
+
 	public boolean skipAddToNOD() {
 		return roadDef.skipAddToNOD();
 	}


=====================================
src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
=====================================
@@ -1381,7 +1381,10 @@ public class StyledConverter implements OsmConverter {
 		  
 		if(zip != null)
 			ms.setZip(zip);
-		  
+
+		if (street == null)  
+			street = element.getTag("addr:place");
+		
 		if(street != null)
 			ms.setStreet(street);
 


=====================================
src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberGenerator.java
=====================================
@@ -1012,6 +1012,7 @@ public class HousenumberGenerator {
 			}
 			for (MapRoad road : namedRoads) {
 				road.setNamedByHousenumberProcessing(true);
+				road.setNamedByIdentifyServiceRoad(true);
 				String name = road.getStreet();
 				if (log.isDebugEnabled())
 					log.debug("pass",pass,"using unnamed road for housenumber processing,id=",road.getRoadDef().getId(),":",name);


=====================================
src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberRoad.java
=====================================
@@ -62,7 +62,24 @@ public class HousenumberRoad {
 	}
 
 	
+	/**
+	 * Remember a place name so that the labels are set accordingly. 
+	 * @param name the place name
+	 */
 	public void addPlaceName(String name) {
+		if (streetName == null) {
+			streetName = name;
+			return;
+		}
+		if (streetName.equals(name)) 
+			return;
+		if (getRoad().isNamedByIdentifyServiceRoad()) {
+			// forget the name, the road is probably not a service road for a named road
+			// when a nearby house number is used with addr:place
+			streetName = name;
+			getRoad().setNamedByIdentifyServiceRoad(false);
+			return;
+		}
 		if (furtherNames == null){
 			furtherNames = new LinkedHashSet<>();
 		}
@@ -511,9 +528,7 @@ public class HousenumberRoad {
 	}
 	
 	public void setNumbers() {
-		if (extNumbersHead == null)
-			return;
-		if (houseNumbers.isEmpty())
+		if (extNumbersHead == null || extNumbersHead.getNumberList().isEmpty())
 			return;
 		// make sure that the name we used for the cluster is also attached to the road
 		if (streetName == null){



View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/commit/1ca07776f3f6d973b5c59d20fcb569e02875079e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/commit/1ca07776f3f6d973b5c59d20fcb569e02875079e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20231001/de8b9b57/attachment-0001.htm>