diff --git a/Makefile b/Makefile index f04e488..05a715e 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,14 @@ resetdb: ## Reset the dev database dumpgeo: ## Dump building geo data $(MANAGE) dumpgeo > data/geocoding.csv +loadgeo: ## Load saved geo data + $(MANAGE) loadgeo data/geocoding.csv + scrape: ## Scrape new data cd data && $(MAKE) $(MFLAGS) clean elevator_data_file.csv python tx_elevators/scripts/scrape.py data/elevator_data_file.csv @echo "should geocode the top 1000 too: $(MANAGE) geocode" - # timing for trivial import real 1m51.994s # timing for a fresh import real 4m15.279s import: @@ -55,15 +57,16 @@ web/stop: web.pid # FINISHED --2016-04-01 04:48:54-- # Total wall clock time: 4m 59s # Downloaded: 26757 files, 126M in 0.1s (971 MB/s) +site: ## Scrape the site site: web/start mkdir -p ._site cd ._site && wget -r localhost:$(PORT) --force-html -e robots=off -nH -nv --max-redirect 0 || true @$(MAKE) web/stop -serve: +serve: ## Serve from the scraped site on port 8088 cd ._site && python -m SimpleHTTPServer 8088 -upload: +upload: ## Upload the scraped site to s3 aws s3 sync ._site s3://$(AWS_BUCKET_NAME)/ \ --cache-control "max-age=2592000" \ --acl "public-read" diff --git a/tx_elevators/static/tx_elevators/js/tx_elevators.js b/tx_elevators/static/tx_elevators/js/tx_elevators.js index cc0d5b9..01db0f0 100644 --- a/tx_elevators/static/tx_elevators/js/tx_elevators.js +++ b/tx_elevators/static/tx_elevators/js/tx_elevators.js @@ -91,11 +91,11 @@ centerLatLng.longitude); var pinColor = "FFFF00"; var pinImage = new google.maps.MarkerImage( - "http://chart.apis.google.com/chart?chst=d_map_pin_icon&chld=home|" + pinColor, + "https://chart.apis.google.com/chart?chst=d_map_pin_icon&chld=home|" + pinColor, new google.maps.Size(21, 34), new google.maps.Point(0,0), new google.maps.Point(10, 34)); - var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow", + var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", new google.maps.Size(40, 37), new google.maps.Point(0, 0), new google.maps.Point(12, 35)); @@ -139,7 +139,7 @@ position = new google.maps.LatLng(building.latitude, building.longitude); pinImage = new google.maps.MarkerImage( - "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=" + + "https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=" + String.fromCharCode(65 + i) + "|" + pinColor, new google.maps.Size(21, 34), new google.maps.Point(0,0), diff --git a/tx_elevators/templates/tx_elevators/about.html b/tx_elevators/templates/tx_elevators/about.html index 4840d73..7dacd39 100644 --- a/tx_elevators/templates/tx_elevators/about.html +++ b/tx_elevators/templates/tx_elevators/about.html @@ -75,11 +75,11 @@
The code for this site is available under an open source license at - GitHub. + GitHub. It was coded over a few nights and most of a - weekend + weekend by a programmer from - The Texas Tribune. + The Texas Tribune.
diff --git a/tx_elevators/templates/tx_elevators/building_detail.html b/tx_elevators/templates/tx_elevators/building_detail.html index 893c95b..644df1d 100644 --- a/tx_elevators/templates/tx_elevators/building_detail.html +++ b/tx_elevators/templates/tx_elevators/building_detail.html @@ -51,4 +51,21 @@