Merge pull request #88 from MapServer/pgsql

Improve Postgresql support with support than other schema to publish data

Author: yjacolin

Makefile

@@ -18,6 +18,7 @@ OSM_NAME_COLUMN?=name
 OSM_SRID?=3857
 OSM_UNITS?=meters
 OSM_DB_CONNECTION?=host=localhost dbname=osm user=osm password=osm port=5432
+OSM_SCHEMA?=public
 OSM_EXTENT?=-20000000 -20000000 20000000 20000000
 OSM_FORCE_POSTGIS_EXTENT?=0
 OSM_WMS_SRS?=EPSG:900913 EPSG:4326 EPSG:3857 EPSG:2154 EPSG:310642901 EPSG:4171 EPSG:310024802 EPSG:310915814 EPSG:310486805 EPSG:310702807 EPSG:310700806 EPSG:310547809 EPSG:310706808 EPSG:310642810 EPSG:310642801 EPSG:310642812 EPSG:310032811 EPSG:310642813 EPSG:2986 EPSG:3035
@@ -111,6 +112,7 @@ $(mapfile):$(template) $(includes)
 	$(SED) 's/##.*$$//g' $(mapfile)
 	$(SED) '/^ *$$/d' $(mapfile)
 	$(SED) -e 's/OSM_PREFIX_/$(OSM_PREFIX)/g' $(mapfile)
+	$(SED) -e 's/OSM_SCHEMA/$(OSM_SCHEMA)/g' $(mapfile)
 	$(SED) -e 's/OSM_SRID/$(OSM_SRID)/g' $(mapfile)
 	$(SED) -e 's/OSM_UNITS/$(OSM_UNITS)/g' $(mapfile)
 	$(SED) -e 's/OSM_EXTENT/$(OSM_EXTENT)/g' $(mapfile)

buildings.map

@@ -12,7 +12,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-    DATA "geometry from (select geometry,osm_id, OSM_NAME_COLUMN as name from OSM_PREFIX_buildings) as foo using unique osm_id using srid=OSM_SRID"
+    DATA "geometry from (select geometry,osm_id, OSM_NAME_COLUMN as name from OSM_SCHEMA.OSM_PREFIX_buildings) as foo using unique osm_id using srid=OSM_SRID"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"

config.conf.tpl

@@ -1,6 +1,6 @@
 CONFIG
   ENV
-    ##MS_MAP_PATTERN "^/etc/mapserver"
+    MS_MAP_PATTERN "^\/etc\/mapserver\/([^\.][-_A-Za-z0-9\.]+\/{1})*([-_A-Za-z0-9\.]+\.map)"
 
 #if _debug > 0 || _layerdebug > 0
     MS_ERRORFILE "stderr"
@@ -9,7 +9,7 @@ CONFIG
     PROJ_LIB _proj_lib
   END
   MAPS
-    BASEMAPS "/etc/mapserver/osm-default.map"
+    BASEMAPS "/etc/mapserver/osm-google.map"
   END
 END
 

docker.mk

@@ -1,4 +1,5 @@
 OSM_DB_CONNECTION=host=postgis dbname=osm user=osm password=osm port=5432
+OSM_SCHEMA=prod
 OSM_PREFIX=osm_
 OSM_FORCE_POSTGIS_EXTENT=1
 OSM_WMS_SRS=EPSG:900913 EPSG:4326 EPSG:3857 EPSG:28992

docker/imposm/import.sh

@@ -35,4 +35,4 @@ for url in $PBF_FILES; do
 done
 
 imposm import $OPTIONS -write
-imposm import $OPTIONS -deployproduction
+imposm import $OPTIONS --dbschema-production=prod -deployproduction

generate_style.py

@@ -930,7 +930,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-    DATA "geometry from (select geometry, osm_id, type from OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
+    DATA "geometry from (select geometry, osm_id, type from OSM_SCHEMA.OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
     CLASSITEM "type"
     CLASS
       EXPRESSION "runway"

highways.map

@@ -257,7 +257,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-   DATA "geometry from OSM_PREFIX_transport_areas using unique osm_id using srid=OSM_SRID"
+   DATA "geometry from OSM_SCHEMA.OSM_PREFIX_transport_areas using unique osm_id using srid=OSM_SRID"
    PROCESSING "CLOSE_CONNECTION=DEFER"
    MAXSCALEDENOM _maxscale
    MINSCALEDENOM _minscale