basemaps.patch

diff --git a/Makefile b/Makefile
index 02872a1..2fc7ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ includes=land.map landusage.map borders.map highways.map places.map \
 
 
 mapfile=osm-$(STYLE).map
-here=`pwd`
+here=/usr/share/proj
 
 all:$(mapfile) boundaries.sql
 
diff --git a/buildings.map b/buildings.map
index bb23ff5..ff41d65 100644
--- a/buildings.map
+++ b/buildings.map
@@ -6,6 +6,7 @@ LAYER
     END
     GROUP "default"
     NAME layername(buildings,_layer_suffix)
+    EXTENT OSM_EXTENT
     TYPE POLYGON
     CONNECTIONTYPE postgis
     CONNECTION "OSM_DB_CONNECTION"
diff --git a/generate_style.py b/generate_style.py
index 77012f5..d2f3c25 100755
--- a/generate_style.py
+++ b/generate_style.py
@@ -1022,6 +1022,9 @@ vars= {
 
 styles = {
    'default': {},
+   'nb': {
+      'display_buildings':0
+   },
    'outlined':{
       'display_motorway_outline': {
          0:0,
@@ -1329,6 +1332,8 @@ style_aliases = {
    # other layers without risk of confusion between layers.
    "default":"default",
 
+   "nb":"nb",
+
    # a style resembling the google-maps theme
    "google":"default,outlined,google",
 
diff --git a/highways.map b/highways.map
index 9776ba9..0cfac36 100644
--- a/highways.map
+++ b/highways.map
@@ -8,6 +8,7 @@ LAYER
     MAXSCALEDENOM _maxscale
     TYPE LINE
     NAME layername(railways,_layer_suffix)
+    EXTENT OSM_EXTENT
     DATA _railways_data
     CLASSITEM "tunnel"
     CLASS
@@ -42,6 +43,7 @@ LAYER
     MINSCALEDENOM _minscale
     MAXSCALEDENOM _maxscale
     NAME layername(roads,_layer_suffix)
+    EXTENT OSM_EXTENT
     CONNECTIONTYPE postgis
     CONNECTION "OSM_DB_CONNECTION"
     DATA _roads_data
@@ -867,6 +869,7 @@ LAYER
     MAXSCALEDENOM _maxscale
     TYPE LINE
     NAME layername(aeroways,_layer_suffix)
+    EXTENT OSM_EXTENT
     CONNECTIONTYPE postgis
     CONNECTION "OSM_DB_CONNECTION"
     DATA "geometry from (select geometry, osm_id, type from OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
diff --git a/landusage.map b/landusage.map
index 856076a..85daedb 100644
--- a/landusage.map
+++ b/landusage.map
@@ -6,6 +6,7 @@ LAYER
         "init=epsg:OSM_SRID"
     END
     NAME layername(landuse,_layer_suffix)
+    EXTENT OSM_EXTENT
     GROUP "default"
     CONNECTIONTYPE POSTGIS
     CONNECTION "OSM_DB_CONNECTION"
@@ -235,6 +236,7 @@ LAYER
        "init=epsg:OSM_SRID"
    END
    NAME layername(transport_areas,_layer_suffix)
+   EXTENT OSM_EXTENT
    GROUP "default"
    CONNECTIONTYPE POSTGIS
    CONNECTION "OSM_DB_CONNECTION"
@@ -275,6 +277,7 @@ LAYER
         "init=epsg:OSM_SRID"
     END
     NAME layername(waterarea,_layer_suffix)
+    EXTENT OSM_EXTENT
     GROUP "default"
     CONNECTIONTYPE POSTGIS
     CONNECTION "OSM_DB_CONNECTION"
@@ -322,6 +325,7 @@ END
 LAYER
     TYPE LINE
     NAME layername(waterways,_layer_suffix)
+    EXTENT OSM_EXTENT
     STATUS ON
     GROUP "default"
     CONNECTIONTYPE POSTGIS
diff --git a/places.map b/places.map
index 722e3b8..386b121 100644
--- a/places.map
+++ b/places.map
@@ -6,6 +6,7 @@ LAYER
  CONNECTIONTYPE postgis
  CONNECTION "OSM_DB_CONNECTION"
  NAME layername(places,_layer_suffix)
+ EXTENT OSM_EXTENT
  MINSCALEDENOM _minscale
  MAXSCALEDENOM _maxscale
  DATA _places_data