use tiles from osm & allow using database config for dev

sitcomlab · Feb 22, 2015 · 23e38f1 · 23e38f1
1 parent 9d4909e
commit 23e38f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/assets/javascripts/angular/controllers/MapController.js.coffee b/app/assets/javascripts/angular/controllers/MapController.js.coffee
@@ -66,7 +66,7 @@ angular.module("DialogMapApp").controller "MapController", [
           enable: ['moveend','draw:created','click','popupopen']
           logic: 'emit'
       tiles:
-        url: '/tiles/{z}/{x}/{y}.png'
+        url: 'http://tile.openstreetmap.org/{z}/{x}/{y}.png'
       # contains all geofeatures
       geojson:
         data: { "type": "FeatureCollection", "features": [] }

diff --git a/config/database.yml b/config/database.yml
@@ -22,8 +22,9 @@ default: &default
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: 5
-  username: dialog_map
-  password: dialog_map
+  username: postgres
+  password: <%= ENV['POSTGIS_ENV_POSTGRES_PASSWORD'] %>
+  host: <%= ENV['POSTGIS_PORT_5432_TCP_ADDR'] %>
 
 development:
   <<: *default
@@ -82,7 +83,4 @@ test:
 #
 production:
   <<: *default
-  host: <%= ENV['POSTGIS_PORT_5432_TCP_ADDR'] %>
   database: dialog_map_production
-  username: postgres
-  password: <%= ENV['POSTGIS_ENV_POSTGRES_PASSWORD'] %>