debian/changelog

-mkgmap (0.0.0+svn3978-1) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn3995-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
   * Update copyright file.
   * Bump Standards-Version to 4.0.0, no changes.
   * Add autopkgtest to test installability.
+  * Update copyright-format URL to use HTTPS.
+  * Update Vcs-* URLs for Salsa.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sat, 05 Aug 2017 14:12:40 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 02 Sep 2017 12:13:45 +0200
 
 mkgmap (0.0.0+svn3741-1) unstable; urgency=medium
 

debian/control

@@ -15,8 +15,8 @@ Build-Depends: ant,
                libosmpbf-java,
                time
 Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap.git
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/mkgmap
+Vcs-Git: https://salsa.debian.org/debian-gis-team/mkgmap.git
 Homepage: http://www.mkgmap.org.uk
 
 Package: mkgmap

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Steve Ratcliffe <sr@parabola.me.uk>
 Upstream-Name: mkgmap
 Source: http://www.mkgmap.org.uk/download/

resources/mkgmap-version.properties

-svn.version: 3978
-build.timestamp: 2017-08-04T09:44:15+0100
+svn.version: 3995
+build.timestamp: 2017-08-24T14:50:49+0100

resources/styles/default/lines

@@ -33,7 +33,7 @@ highway=* & mkgmap:mp_created=true {add area=yes}
 # Hide other non-existent ways
 (highway=unbuilt | highway=neverbuilt | highway=rejected | highway ~ 'x-.*') {delete highway;delete junction}
 # Remove highway tag from ways which are not suitable for routing
-highway=traffic_signals | highway=junction | highway=island | highway=centre_line | highway=traffic_island  {delete highway} 
+highway=traffic_signals | highway=junction | highway=island | highway=centre_line | highway=traffic_island | highway=stopline {delete highway} 
 highway=piste | highway=ski {delete highway}
 highway=no | highway=none {delete highway}
  
@@ -94,6 +94,11 @@ highway=* & (
 
 highway=* & mkgmap:unpaved!=1 & smoothness ~ '.*(bad|horrible|impassable)'  { add mkgmap:road-speed = '-2' } 
 
+# Good ways without relation
+highway=* & mkgmap:fast_road!=* & (int_ref=* | network=e-road | network=AH | network=TAH | network=US:I | network=US:US) {add mkgmap:fast_road=yes}
+# Not best for car routing
+highway=* & (access=hov | hov=designated | oneway=reversible) {set mkgmap:road-class=-2; set mkgmap:road-speed=-2; delete mkgmap:fast_road}
+
 # Convert generic path to most specific
 highway=footway & snowplowing!=no
 & (bicycle=yes|bicycle=designated|bicycle=permissive|bicycle=official)
@@ -113,9 +118,15 @@ leisure=track & area!=yes
 junction=roundabout & (highway=trunk | highway=trunk_link) [0x0c road_class=4 road_speed=2 resolution 24 continue]
 junction=roundabout & (highway=trunk | highway=trunk_link) [0x10801 resolution 18]
 
+junction=roundabout & (highway=primary | highway=primary_link) & mkgmap:fast_road=yes [0x0c road_class=4 road_speed=2 resolution 24 continue]
+junction=roundabout & (highway=primary | highway=primary_link) & mkgmap:fast_road=yes [0x10802 resolution 19]
+
 junction=roundabout & (highway=primary | highway=primary_link) [0x0c road_class=3 road_speed=2 resolution 24 continue]
 junction=roundabout & (highway=primary | highway=primary_link) [0x10802 resolution 19]
 
+junction=roundabout & (highway=secondary | highway=secondary_link) & mkgmap:fast_road=yes [0x0c road_class=3 road_speed=2 resolution 24 continue]
+junction=roundabout & (highway=secondary | highway=secondary_link) & mkgmap:fast_road=yes [0x10803 resolution 20]
+
 junction=roundabout & (highway=secondary | highway=secondary_link) [0x0c road_class=2 road_speed=2 resolution 24 continue]
 junction=roundabout & (highway=secondary | highway=secondary_link) [0x10803 resolution 20]
 
@@ -125,7 +136,6 @@ junction=roundabout & (highway=tertiary | highway=tertiary_link) [0x10804 resolu
 junction=roundabout & (highway=unclassified | highway=minor ) [0x0c road_class=1 road_speed=1 resolution 21]
 junction=roundabout & highway=* [0x0c road_class=0 road_speed=1 resolution 22]
 
-
 # Ways that may or may not be useable
 
 # Treat ways under construction almost as highway=path, see also extra rule in inc/access
@@ -138,22 +148,25 @@ highway=* & construction=* & maxspeed!=* { add mkgmap:road-speed = '-1' }
 highway=* & disused=yes & maxspeed!=* { add mkgmap:road-speed = '-2' }
 
 # Ways sorted roughly by descending order of class
-highway=motorway & network=e-road [0x01 resolution 14-14 continue]
+highway=motorway & mkgmap:fast_road=yes [0x01 road_class=4 road_speed=7 resolution 14]
 highway=motorway [0x01 road_class=4 road_speed=7 resolution 15]
-highway=motorway_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=3 road_speed=2 resolution 20]
-highway=motorway_link [0x09 road_class=3 road_speed=2 resolution 20]
+highway=motorway_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=4 road_speed=2 resolution 20]
+highway=motorway_link [0x09 road_class=4 road_speed=2 resolution 20]
 
-highway=trunk & ( network=e-road | int_ref=* ) [0x02 resolution 15-17 continue]
+highway=trunk & mkgmap:fast_road=yes [0x02 road_class=4 road_speed=5 resolution 15]
 highway=trunk [0x02 road_class=4 road_speed=5 resolution 18]
-highway=trunk_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=3 road_speed=2 resolution 20]
-highway=trunk_link [0x09 road_class=3 road_speed=2 resolution 20]
+highway=trunk_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=4 road_speed=2 resolution 20]
+highway=trunk_link [0x09 road_class=4 road_speed=2 resolution 20]
 highway=* & motorroad=yes [0x02 road_class=4 road_speed=4 resolution 18]
-highway=primary & ( network=e-road | int_ref=* ) [0x03 resolution 17-18 continue]
+highway=primary & mkgmap:fast_road=yes [0x03 road_class=4 road_speed=4 resolution 17]
 highway=primary [0x03 road_class=3 road_speed=4 resolution 19]
+highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) & mkgmap:fast_road=yes [0x06 road_class=4 road_speed=1 resolution 21]
 highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=3 road_speed=1 resolution 21]
+highway=primary_link & mkgmap:fast_road=yes [0x08 road_class=4 road_speed=1 resolution 21]
 highway=primary_link [0x08 road_class=3 road_speed=1 resolution 21]
-highway=secondary & ( network=e-road | int_ref=* ) [0x04 resolution 18-19 continue]
+highway=secondary & mkgmap:fast_road=yes [0x04 road_class=3 road_speed=3 resolution 18]
 highway=secondary [0x04 road_class=2 road_speed=3 resolution 20]
+highway=secondary_link & mkgmap:fast_road=yes [0x08 road_class=3 road_speed=1 resolution 22]
 highway=secondary_link [0x08 road_class=2 road_speed=1 resolution 22]
 highway=tertiary [0x05 road_class=1 road_speed=3 resolution 20]
 highway=tertiary_link [0x08 road_class=1 road_speed=1 resolution 22]

resources/styles/default/points

@@ -258,7 +258,7 @@ shop=shoes [0x2e07 resolution 24]
 shop=supermarket [0x2e02 resolution 24]
 shop=tires [0x2f07 resolution 24]
 shop=tyres [0x2f07 resolution 24]
-shop=* [0x2e0c resolution 24]
+shop=* & shop!=no & shop!=none [0x2e0c resolution 24]
 
 sport=9pin [0x2d07 resolution 24]
 sport=10pin | leisure=bowling_alley [0x2d07 resolution 24]

resources/styles/default/polygons

@@ -52,8 +52,6 @@ leisure=track & area=yes [0x19 resolution 21]
 leisure=water_park [0x09 resolution 21]
 
 place=village [0x03 resolution 19]
-place=island & name=* [0x53 resolution 19]
-place=islet & name=* [0x53 resolution 20]
 
 shop=* [0x08 resolution 22]
 
@@ -82,6 +80,10 @@ man_made=* & area=yes
 include 'inc/water_polygons';
 include 'inc/landuse_polygons';
 
+# render small named islands 
+place=island & name=* & area_size() < 1000000 [0x53 resolution 19]
+place=islet & name=* [0x53 resolution 20]
+
 <finalize>
 # The finalizer section is executed for each element when a rule with an element type matches
 

resources/styles/default/relations

@@ -16,6 +16,7 @@
 # and alphabetically by name first.
 # Currently, the matching relations will be processed and the names
 # appended to the boundary lines in an arbitrary order.
+
 (type=boundary | type=multipolygon) & boundary=administrative & name=*
 { apply
   {
@@ -23,9 +24,6 @@
   }
 }
 
-# European E-Road network
-route=road & network=e-road { apply { add ref='${ref}'; add int_ref='${int_ref}'; add network='e-road' } }
-
 # Public transportation routes.
 # We could want to sort the matching relations by ref first.
 type=route
@@ -53,3 +51,80 @@ type=route
   # We could want to copy the route relation name to unnamed route=ferry ways.
   # apply way { add name='${name}' }
 }
+
+# European E-Road network
+route=road & network=e-road {
+	apply {
+		add ref='${ref}';
+		add int_ref='${int_ref}';
+		add network='e-road'
+        add mkgmap:fast_road=yes;
+	}
+}
+
+#USA road network
+type=route & route=road & historic!=yes & network=US:I
+{
+    apply {
+        set mkgmap:us_interstate='$(mkgmap:us_interstate);${ref|not-contained:;:mkgmap:us_interstate}' | '$(mkgmap:us_interstate)' | '${ref}';
+        add network='US:I';
+        add mkgmap:fast_road=yes;
+    }
+}
+type=route & route=road & historic!=yes & network~'US:I:.*'
+{
+    apply {
+        add network='US:I';
+        add mkgmap:fast_road=yes;
+    }
+}
+type=route & route=road & historic!=yes & network=US:US
+{
+    apply {
+        set mkgmap:us_usroute='$(mkgmap:us_usroute);${ref|not-contained:;:mkgmap:us_usroute}' | '$(mkgmap:us_usroute)' | '${ref}';
+        add network='US:US';
+        add mkgmap:fast_road=yes;
+    }
+}
+type=route & route=road & historic!=yes & network~'US:US:.*'
+{
+    apply {
+        add network='US:US';
+        add mkgmap:fast_road=yes;
+    }
+}
+type=route & route=road & historic!=yes & network~'US:.*' & !(network=US:I | network=US:US | network~'US:.*:.*')
+{
+    apply {
+        add mkgmap:us_state='$(mkgmap:us_state);${ref|not-contained:;:mkgmap:us_state}' | '$(mkgmap:us_state)' | '${ref}';
+        add network='${network}';
+    }
+}
+
+#Trans African Highway
+type=route & route=road & historic!=yes & (network~'TAH.*' | ref~'TAH.*' | network~'Trans.African Highway')
+{
+    apply {
+        add network='TAH';
+        add int_ref='${ref}';
+        add mkgmap:fast_road=yes;
+    }
+}
+
+#Asian Highway
+type=route & route=road & historic!=yes & (network=AsianHighway | network=AH)
+{
+    apply {
+        add network='AsianHighway';
+        add int_ref='${ref}';
+        add mkgmap:fast_road=yes;
+    }
+}
+
+#any highway
+type=route & route=road & historic!=yes & ref=*
+{
+    apply {
+        add ref='${ref}';
+    }
+}

src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java

@@ -648,7 +648,7 @@ public class StyledConverter implements OsmConverter {
 		lines = null;
 		if (roadLog.isInfoEnabled()) {
 			roadLog.info("Flags: oneway,no-emergency, no-delivery, no-throughroute, no-truck, no-bike, no-foot, carpool, no-taxi, no-bus, no-car");
-			roadLog.info(String.format("%19s %4s %11s %6s %s", "Road-OSM-Id","Type","Flags", "Points", "Labels"));
+			roadLog.info(String.format("%19s %4s %11s %6s %6s %6s %s", "Road-OSM-Id","Type","Flags", "Class", "Speed", "Points", "Labels"));
 		}
 		// add the roads after the other lines
 		for (ConvertedWay cw : roads){
@@ -1768,7 +1768,7 @@ public class StyledConverter implements OsmConverter {
 				cmpAccess |= 1<<10;
 			}
 			String access = String.format("%11s",Integer.toBinaryString(cmpAccess)).replace(' ', '0');
-			roadLog.info(String.format("%19d 0x%-2x %11s %6d %s", way.getId(), road.getType(), access, road.getPoints().size(),Arrays.toString(road.getLabels())));
+			roadLog.info(String.format("%19d 0x%-2x %11s %6d %6d %6d %s", way.getId(), road.getType(), access, road.getRoadDef().getRoadClass(), road.getRoadDef().getRoadSpeed(), road.getPoints().size(),Arrays.toString(road.getLabels())));
 		}
 		
 		// add the road to the housenumber generator

src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberGroup.java

@@ -148,6 +148,10 @@ public class HousenumberGroup {
 			pointToUse = (len1 <= len2) ? c1 : c2;
 		} else {
 			Coord optPoint = ExtNumbers.rasterLineNearPoint(c1, c2, pointToUse, true);
+			if (optPoint == null) {
+				log.error("Internal error: ExtNumbers.rasterLineNearPoint() found no point, cannot improve address search for road",getRoad());
+				return false;
+			}
 			double opt1Dist = c1.distance(optPoint);
 			double opt2Dist = c2.distance(optPoint);
 			pointToUse = optPoint;