Standard layer (#2)

![image](https://github.com/hiddewie/OpenRailwayMap-vector/assets/1073881/4e091101-8364-43dd-b9fd-9b2599237971)
hiddewie · Feb 29, 2024 · 4efc4ef · 4efc4ef
1 parent ab0674d
commit 4efc4ef
Show file tree

Hide file tree

Showing 15 changed files with 2,504 additions and 1,307 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,10 +26,14 @@ services:
       dockerfile: Dockerfile.db
     ports:
       - '5432:5432'
+    volumes:
+      - ./postgres-data:/var/lib/postgresql/postgres-data
+    shm_size: 1g
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - PG_WORK_MEM
       - PG_MAINTENANCE_WORK_MEM
+      - PGDATA=/var/lib/postgresql/postgres-data
 
   import:
     image: import:v1
@@ -75,6 +79,8 @@ services:
       dockerfile: martin.Dockerfile
     depends_on:
       - db
+    volumes:
+      - ./martin:/config
     environment:
       - DATABASE_URL=postgresql://postgres@db:5432/gis
 
@@ -85,6 +91,8 @@ services:
   martin-proxy:
     build:
       dockerfile: proxy.Dockerfile
+    volumes:
+      - ./proxy/index.html:/etc/nginx/public/index.html
     ports:
       - '8000:8000'
     environment:

diff --git a/docker-startup.sh b/docker-startup.sh
@@ -70,9 +70,10 @@ EOF
     /tmp/filtered.osm.pbf
 
   # Post processing imported data
-  psql -d gis -f sql/functions.sql && \
-  psql -d gis -f sql/osm_carto_views.sql && \
+  psql -d gis -f sql/functions.sql
+  psql -d gis -f sql/osm_carto_views.sql
   psql -d gis -f sql/get_station_importance.sql
+  psql -d gis -f sql/tile_views.sql
   ;;
 
 kosmtik)

diff --git a/martin/configuration.yml b/martin/configuration.yml
@@ -35,6 +35,167 @@ postgres:
 
   # Associative arrays of table sources
   tables:
+
+    # --- Standard --- #
+
+    railway_line_low:
+      schema: public
+      table: railway_line_low
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_line_med:
+      schema: public
+      table: railway_line_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_turntables:
+      schema: public
+      table: railway_turntables
+      srid: 3857
+      geometry_column: way
+      geometry_type: POLYGON
+      properties:
+        railway: string
+
+    railway_line_fill:
+      schema: public
+      table: railway_line_fill
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_text_stations_med:
+      schema: public
+      table: railway_text_stations_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        station: string
+        label: string
+
+    railway_text_stations_high:
+      schema: public
+      table: railway_text_stations_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        station: string
+        label: string
+
+    railway_symbols:
+      schema: public
+      table: railway_symbols
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        man_made: string
+
+    railway_text_med:
+      schema: public
+      table: railway_text_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        label: string
+
+    railway_text_high:
+      schema: public
+      table: railway_text_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        label: string
+
+    railway_text_km_med:
+      schema: public
+      table: railway_text_km_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        pos: string
+
+    railway_text_km_high:
+      schema: public
+      table: railway_text_km_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        pos: string
+
+    railway_switch_ref:
+      schema: public
+      table: railway_switch_ref
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        ref: string
+        railway_local_operated: string
+
+    railway_text_detail:
+      schema: public
+      table: railway_text_detail
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        usage: string
+        service: string
+        label: string
+        track_ref: string
+
+    # --- Signalling --- #
+
     railway_line:
       schema: public
       table: railway_line
@@ -43,11 +204,11 @@ postgres:
       geometry_type: LINESTRING
       properties:
         railway: string
+        feature: string
         usage: string
         service: string
         layer: number
         rank: number
-        construction_railway: string
         train_protection: string
 
     railway_signals: