WIP

Author: MarcelloPerathoner

Makefile

@@ -203,6 +203,7 @@ data: data/hiking-trails.geojson       			\
 	data/hiking-trails-eisacktal.geojson  		\
 	data/hiking-trails-pustertal.geojson    	\
 	data/hiking-trails-salten-schlern.geojson	\
+	data/hiking-trails-unterland.geojson    	\
 	data/mtb-tours.json            		\
 	data/bicycle-lanes.json        		\
 	data/ski-pistes.json           		\
@@ -217,6 +218,9 @@ data/hiking-trails-%.geojson: downloadService/HikingTrails.geojson data/%.extent
 	$(RM) $@
 	$(OGR2_BASE) -spat $(file < data/$*.extent) -nlt LINESTRING $@ $<
 
+# write extent files with:
+# scripts/check_routes_order.py -a 6536736 --write-areas-bbox data/unterland.extent
+
 # get SkiPistes manually from http://geokatalog.buergernetz.bz.it/geokatalog/
 # use this as data layer in JOSM
 data/ski-pistes.json: downloadService/dataset/SkiPistes_polygon.shp

areas.unterland.args

@@ -0,0 +1,19 @@
+--areas
+6536736 # Überetsch-Unterland
+  47207 # Bozen
+
+--geokatalog
+data/hiking-trails-unterland.geojson
+
+--osm-ignore
+ 3182798 # Boymont
+ 2172730 # Katzenleiter
+ 1524702 # O500
+ 7077998 # O502A
+ 6899726 # SI C06
+10551322 # Weinlehrpfad (Sallegg)
+
+--gk-warn
+502
+513
+Trimm dich Pfad

scripts/check_routes_order.py

@@ -48,7 +48,7 @@ def check_osmc_symbol (rtags, errors):
         if m:
             rx = '^red:red:white_bar:%s:black$' % m.group (1)
 
-        m = re.match (r'E([0-9]{3}[ABC]?)$', ref) # Trentino Est
+        m = re.match (r'(?:E|O)([0-9]{3}[ABC]?)$', ref) # Trentino Est / Ovest
         if m:
             rx = '^red:red:white_stripe:%s:black$' % m.group (1)
 
@@ -346,15 +346,15 @@ def build_parser ():
     parser.add_argument ('-g', '--geokatalog', nargs='*',
                          metavar='path/to/geokatalog.geojson',
                          help="load geokatalog geojson file")
-    parser.add_argument ('--osm-ignore', nargs='*', type=int, dest='osm_ignore',
+    parser.add_argument ('--osm-ignore', nargs="*", type=int, dest='osm_ignore', action='extend',
                          metavar='OSM_RELID',
                          default = [],
                          help="ignore these OSM routes")
-    parser.add_argument ('--osm-warn', nargs='*', type=int, dest='osm_warn',
+    parser.add_argument ('--osm-warn', nargs='*', type=int, dest='osm_warn', action='extend',
                          metavar='OSM_RELID',
                          default = [],
                          help="convert errors into warnings for these OSM routes")
-    parser.add_argument ('--gk-warn', nargs='*', dest='gk_warn',
+    parser.add_argument ('--gk-warn', nargs='*', dest='gk_warn', action='extend',
                          metavar='GEOKATALOG_ID',
                          default = [],
                          help="convert errors into warnings for these geokatalog routes")
@@ -435,7 +435,7 @@ def osm_route_key (i):
                 and rtags['type'] == 'route'  # not abandoned etc.
                 and route in connect.HIKING_TYPES
                 and 'buffered' in osm_route
-                and not re.match (r'E|SI|VA', rtags.get ('ref', ''))
+                and not re.match (r'E|O|SI|VA', rtags.get ('ref', ''))
                 and not 'via_ferrata_scale' in rtags
                 and not rtags.get ('hiking') == 'via_ferrata'):
 

scripts/connect.py

@@ -9,7 +9,7 @@
 from multiprocessing import Pool
 
 import requests
-import osmapi
+# import osmapi
 
 import shapely.ops
 from shapely.geometry import MultiLineString, LineString, MultiPoint, Point, MultiPolygon, Polygon, LinearRing, box
@@ -21,10 +21,6 @@
 
 MY_UID = 8199540
 
-BOUNDARY_ST = (
-    47046, # South Tyrol
-)
-
 CHUNKS = {
      934999 : 2, # Hike: "Sentiero Europeo E5, Italia", Gap @ Bolzano
      959876 : 2, # Road: LS64 Gap @ Kastelruth
@@ -39,6 +35,8 @@
 CHECKED_TYPES = HIKING_TYPES + ('bicycle', 'mtb', 'piste', 'ski', 'bus', 'road')
 """ Route types we check. """
 
+DISUSED_TYPES = ('disused', 'abandoned', 'rased')
+
 
 # Transform a string so that numbers in the string sort naturally.
 #
@@ -53,6 +51,17 @@ def f (m):
         return str (len (s)) + s
     return re.sub ('\d+', f, s)
 
+WAY_TAGS = set ((
+    'highway',
+    'disused:highway',
+    'abandoned:highway',
+    'demolished:highway',
+    'removed:highway',
+    'razed:highway',
+    'railway',
+    'aerialway',
+    'piste:type',
+))
 
 def way_is_way (way, clip_exceptions = False):
     # only consider these kinds of ways
@@ -61,11 +70,7 @@ def way_is_way (way, clip_exceptions = False):
     if clip_exceptions and 'geokatalog:exception' in wtags:
         return False
 
-    return wtags and ('highway'       in wtags or
-                      'razed:highway' in wtags or
-                      'railway'       in wtags or
-                      'aerialway'     in wtags or
-                      'piste:type'    in wtags)
+    return wtags and WAY_TAGS.intersection (wtags.keys ())
 
 
 def way_is_area (way):
@@ -223,9 +228,7 @@ def relation_full (rel_id):
 
 def init ():
     connect.log = logging.getLogger ().log
-    connect.api = osmapi.OsmApi (passwordfile = Path ("~/.osmpass").expanduser ())
 
-    # area_ids = BOUNDARY_ST + tuple (sys.args.areas)
     area_ids = tuple (sys.args.areas)
     with Pool () as p:
         polys = list (tqdm (
@@ -235,5 +238,4 @@ def init ():
         ))
 
     polys = [p for sublist in polys for p in sublist] # flatten list of lists
-    # connect.boundary_south_tyrol = polys.pop (0)
     connect.boundary = shapely.ops.unary_union (polys)

scripts/geokatalog.py

@@ -49,7 +49,6 @@
 matched = 0
 
 BUFFER   = 100.0
-# RESAMPLE = 100.0
 
 # SRS_BZIT = EPSG:25832    # ETRS89 / UTM zone 32N used by provinz.bz.it
 # SRS_WGS  = EPSG:4326     # WGS84
@@ -60,69 +59,6 @@
 transformer  = Transformer.from_crs ("EPSG:4326", "EPSG:25832", always_xy = True)
 itransformer = Transformer.from_crs ("EPSG:25832", "EPSG:4326", always_xy = True)
 
-# def dist (a, b):
-#     """ Since we are using UTM we can use a simple euclidean distance. """
-#     return math.sqrt ((b[0] - a[0]) ** 2 + (b[1] - a[1]) ** 2)
-
-
-# def _distance (coords1, coords2):
-#     """ Return Hausdorff distance in m """
-
-#     hd1 = scipy.spatial.distance.directed_hausdorff (coords1, coords2)
-
-#     # hd2 = scipy.spatial.distance.directed_hausdorff (coords2, coords1)
-#     # hd = max (hd1[0], hd2[0])
-
-#     a = coords1[hd1[1]]
-#     b = coords2[hd1[2]]
-#     return dist (a, b)
-
-
-# def coords (geom):
-#     if geom.is_empty:
-#         return []
-#     if geom.type in ('LineString', 'LinearRing'):
-#         return geom.coords
-#     if geom.type.startswith ('Multi') or geom.type == 'GeometryCollection':
-#         return [c for l in geom for c in l.coords ]
-#     return []
-
-
-# def resample (geom, threshold):
-#     """Resample the linestrings in geometry.
-
-#     After resampling the distance between consecutive points in a linestring
-#     will be no longer than threshold.
-
-#     """
-
-#     if geom.is_empty:
-#         return geom
-
-#     if geom.type in ('LineString', 'LinearRing'):
-#         pts = []
-#         last_pt = geom.coords[0]
-
-#         for pt in geom.coords:
-#             d = dist (pt, last_pt)
-#             if d > threshold:
-#                 # add some points in between
-#                 long_line = LineString ([last_pt, pt])
-#                 i = threshold
-#                 while i <= d:
-#                     pts.append (long_line.interpolate (i))
-#                     i += threshold
-#             pts.append (pt)
-#             last_pt = pt
-
-#         return type (geom) (pts)
-
-#     elif geom.type.startswith ('Multi') or geom.type == 'GeometryCollection':
-#         return type (geom) ([ resample (part, threshold) for part in geom.geoms])
-
-#     return geom
-
-
 gk_routes  = dict ()
 osm_routes = dict ()
 gk_routes_by_id = dict ()  # needed for STRtree
@@ -154,7 +90,7 @@ def match_route (rtags, gk_props):
         return True
 
     # special case for CAI Trentino Est
-    m = re.match (r'^E(\d\d\d)$', ref)
+    m = re.match (r'^(?:E|O)([0-9]{3}[ABC]?)$', ref)
     if m and gk_ref == m.group (1):
         return True
 
@@ -186,15 +122,13 @@ def get_relation (osm_relation):
 
         geom = connect.osm_relation_as_multilinestring (rfull)
         geom = shapely.ops.transform (transformer.transform, geom)
-        # geom = resample (geom, RESAMPLE)
 
         res['geometry'] = geom
         res['geometry'].id = rel_id
 
         clipped = connect.osm_relation_as_multilinestring (rfull, True)
         clipped = shapely.ops.transform (transformer.transform, clipped)
 
-        # clipped = resample (clipped, RESAMPLE)
         clipped = clip_area (clipped)
 
         if not clipped.is_empty:

scripts/requirements.txt

@@ -0,0 +1,4 @@
+pyproj
+requests
+shapely
+tqdm