From 3a32d1ea80cb78d6a2e6daad169ee5ce8d4b4e9b Mon Sep 17 00:00:00 2001 From: David Taylor Jr Date: Wed, 18 Jan 2017 20:58:46 -0500 Subject: [PATCH] Patch fix for 1.2 merge issues [Finishes #137936109] --- README.md | 4 ++-- scripts/javascript.js | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6d3e977..40e61f0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The app pulls data from the [Dark Sky API](http://darksky.net/dev) and provides: ### Current Version -The current release is [v1.2.0](https://github.com/davidtaylorjr/local-weather-webapp/releases/latest) and is on a steady development cycle. +The current release is [v1.2.1](https://github.com/davidtaylorjr/local-weather-webapp/releases/latest) and is on a steady development cycle. @@ -25,7 +25,7 @@ The current release is [v1.2.0](https://github.com/davidtaylorjr/local-weather-w Future featrues that are currently planned are: -- Alerts for Weather Watches and Warnings +- Precipitation Chance - Extended 3-5 day forecast - And More! diff --git a/scripts/javascript.js b/scripts/javascript.js index 9477d4e..8ee3bfb 100644 --- a/scripts/javascript.js +++ b/scripts/javascript.js @@ -13,11 +13,9 @@ function geoLocation() { //Google Maps API to return printed location as opposed to lat/lon coordinates. -<<<<<<< HEAD + $.getJSON('https://maps.googleapis.com/maps/api/geocode/json?latlng=' + latitude + ',' + longitude + '&key=YOUR-API-KEY', function(city) { -======= - $.getJSON('https://maps.googleapis.com/maps/api/geocode/json?latlng=' + latitude + ',' + longitude + '&key=Your-API-Key', function(city) { ->>>>>>> staging + var address = city.results[2].formatted_address; @@ -31,11 +29,9 @@ function geoLocation() { //current conditions api from Darksky.net and variables for printing inside app. $.ajax({ -<<<<<<< HEAD + url: 'https://api.darksky.net/forecast/YOUR-API-KEY/' + latitude + ',' + longitude + "?units=us", -======= - url: 'https://api.darksky.net/forecast/Your-API-Key/' + latitude + ',' + longitude + "?units=us", ->>>>>>> staging + dataType: "jsonp", success: function(data) {