Merge pull request #23 from SEL-Columbia/restrict-map-#22

Further restrict bounds, num nodes to reduce memory requirements
SEL-Columbia · Feb 23, 2016 · 0fa86aa · 0fa86aa
2 parents d44f969 + a34500b
commit 0fa86aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ gridmaps:
       - ./gridmaps-nginx.conf:/etc/nginx/sites-enabled/gridmaps-nginx.conf
 
 gridmaps-cgimap:
-    image: "selcolumbia/osm-gridmaps-cgimap:0.3"
+    image: "selcolumbia/osm-gridmaps-cgimap:0.4"
     links:
       - "db:db"
     volumes:

diff --git a/server-cgimap/Dockerfile b/server-cgimap/Dockerfile
@@ -24,10 +24,10 @@ WORKDIR /
 RUN git clone git://github.com/zerebubuth/openstreetmap-cgimap.git
 WORKDIR /openstreetmap-cgimap
 # hack to workaround the fact that these aren't configurable yet
-RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 1000\.0/' src/api06/map_handler.cpp 
-RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 1000\.0/' src/api07/map_handler.cpp 
-RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 100000/' src/api06/map_handler.cpp 
-RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 100000/' src/api07/map_handler.cpp 
+RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 100\.0/' src/api06/map_handler.cpp 
+RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 100\.0/' src/api07/map_handler.cpp 
+RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 50000/' src/api06/map_handler.cpp 
+RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 50000/' src/api07/map_handler.cpp 
 RUN ./autogen.sh
 RUN ./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu
 RUN make && make install