From 04418a1c0ba958460ff28caa3a81e8ba9bf4bac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= <yarl@o2.pl>
Date: Mon, 12 Dec 2016 21:58:40 +0100
Subject: [PATCH 1/3] feat(monument): add map

---
 src/components/main/monument/monument.html |  15 +++++++++++
 src/components/main/monument/monument.js   |  30 ++++++++++++++++++++-
 src/components/main/monument/monument.scss |   5 ++++
 src/images/marker.png                      | Bin 0 -> 2118 bytes
 src/index.js                               |   7 +++--
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 src/images/marker.png

diff --git a/src/components/main/monument/monument.html b/src/components/main/monument/monument.html
index c6b9735..5410de4 100644
--- a/src/components/main/monument/monument.html
+++ b/src/components/main/monument/monument.html
@@ -91,6 +91,21 @@ <h4 class="monument__subtitle md-headline">Properties</h4>
                  ng-href="{{$ctrl.getCommonsLink()}}">
         <md-icon>collections</md-icon> {{$ctrl.monument.claims.P373.property[$ctrl.lang]}}
       </md-button>
+
+      <leaflet ng-if="$ctrl.monument.claims.P625"
+               markers="$ctrl.map.markers"
+               center="$ctrl.map.center"></leaflet>
+      <div layout="row" layout-align="center center"
+           ng-if="$ctrl.monument.claims.P625">
+        <md-button class="md-primary" flex
+                   ng-href="https://www.google.com/maps?q={{$ctrl.map.markers.marker.lat}},{{$ctrl.map.markers.marker.lng}}">
+          <md-icon>map</md-icon> Google Maps
+        </md-button>
+        <md-button class="md-primary" flex
+                   ng-href="http://www.openstreetmap.org/#map=17/{{$ctrl.map.markers.marker.lat}}/{{$ctrl.map.markers.marker.lng}}">
+          <md-icon>map</md-icon> OSM
+        </md-button>
+      </div>
     </div>
   </div>
 </md-content>
\ No newline at end of file
diff --git a/src/components/main/monument/monument.js b/src/components/main/monument/monument.js
index cb3c13d..be53f6c 100644
--- a/src/components/main/monument/monument.js
+++ b/src/components/main/monument/monument.js
@@ -2,6 +2,7 @@ import _ from 'lodash';
 
 import './monument.scss';
 import template from './monument.html';
+import '../../../images/marker.png';
 
 const MonumentComponent = {
   controller: controller,
@@ -15,6 +16,7 @@ function controller($http, $q, $sce, $stateParams, $timeout, $window, WikiServic
   vm.getCommonsLink = getCommonsLink;
   vm.image = [];
   vm.lang = $stateParams.lang || 'pl';
+  vm.map = {};
 
   wikidata.setLanguages([vm.lang, 'en']);
   getWikidata();
@@ -81,9 +83,35 @@ function controller($http, $q, $sce, $stateParams, $timeout, $window, WikiServic
       if (vm.monument.claims.P131) {
         getFullLocation(claims.P131.values[0].value_id);
       }
-      if(vm.monument.interwiki[vm.lang + 'wiki']) {
+      if (vm.monument.interwiki[vm.lang + 'wiki']) {
         getArticleHeader(vm.monument.interwiki[vm.lang + 'wiki'].title);
       }
+      if (vm.monument.claims.P625) {
+        const value = vm.monument.claims.P625.values[0].value;
+        const icon = {
+          iconUrl: 'assets/images/marker.png',
+          shadowUrl: undefined,
+          iconSize: [40, 40],
+          shadowSize: [0, 0],
+          iconAnchor: [20, 20],
+          shadowAnchor: [0, 0]
+        };
+
+        vm.map = {
+          center: {
+            lat: value.latitude,
+            lng: value.longitude,
+            zoom: 15
+          },
+          markers: {
+            marker: {
+              lat: value.latitude,
+              lng: value.longitude,
+              icon: icon
+            }
+          }
+        };
+      }
       getInterwiki();
 
       let title = vm.monument.labels[vm.lang] || vm.monument.labels.en || vm.monument.id;
diff --git a/src/components/main/monument/monument.scss b/src/components/main/monument/monument.scss
index e558766..bb7e007 100644
--- a/src/components/main/monument/monument.scss
+++ b/src/components/main/monument/monument.scss
@@ -119,4 +119,9 @@ mo-monument {
         }
     }
     
+    .angular-leaflet-map {
+        width: 100%;
+        height: 300px;
+        margin-top: 20px;
+    }
 }
\ No newline at end of file
diff --git a/src/images/marker.png b/src/images/marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe437427e5e26df15015cca7911197f9d7ea5a2e
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/src/index.js b/src/index.js
index dd32ae0..506d0fa 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,9 +31,12 @@ angular
     'restangular',
     'infinite-scroll',
     'leaflet-directive'
-    ])
+  ])
   .config(stateConfig)
-  .config(themeConfig);
+  .config(themeConfig)
+  .config($logProvider => {
+    $logProvider.debugEnabled(false);
+  });
 
 /**
  * Config of routing

From defe0016511887c49138f6f28239b77bd862ac32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= <yarl@o2.pl>
Date: Mon, 12 Dec 2016 21:59:02 +0100
Subject: [PATCH 2/3] feat(app): change color to wlm red

---
 src/index.js             | 9 +++++++--
 src/styles/_general.scss | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/index.js b/src/index.js
index 506d0fa..a9b86d5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -71,10 +71,15 @@ function stateConfig($stateProvider, $urlRouterProvider) {
  */
 function themeConfig($mdThemingProvider, $provide) {
   let tp = $mdThemingProvider;
+  tp.definePalette('moRed', tp.extendPalette('red', {
+    '500': '#8f0000',
+    '600': '#8f0000'
+  }));
+
   tp.alwaysWatchTheme(true);
   tp.theme('default')
-    .primaryPalette('blue')
-    .accentPalette('red');
+    .primaryPalette('moRed')
+    .accentPalette('blue');
 
   $provide.value('themeProvider', tp);
 }
diff --git a/src/styles/_general.scss b/src/styles/_general.scss
index bb3ecc8..6b59099 100644
--- a/src/styles/_general.scss
+++ b/src/styles/_general.scss
@@ -30,7 +30,7 @@ md-content {
 
 a, a.link {
     cursor: pointer;
-    color: rgb(33,150,243);
+    color: #8f0000;
     text-decoration: none;
 }
 

From 0f1e5a23cd29c7b17be4711b4bc8d1e7e90d6ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= <yarl@o2.pl>
Date: Mon, 12 Dec 2016 21:59:31 +0100
Subject: [PATCH 3/3] version 0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8361890..0daa81e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monumental",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": true,
   "description": "Monumental app",
   "main": "src/index.js",