@@ -18,12 +18,12 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
1818 }
1919 $scope . inializeMap = function ( ) {
2020 $scope . map = L . map ( 'map' ) . setView ( [ 30.0444 , 31.2357 ] , 2 ) ;
21- //mymap.on('load', onMapLoad);
22- var Esri_OceanBasemap = L . tileLayer ( 'https ://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/tile/{z}/{y}/{x}' , {
23- attribution : 'Tiles © Esri — Sources: GEBCO, NOAA, CHS, OSU, UNH, CSUMB, National Geographic, DeLorme, NAVTEQ, and Esri ' ,
24- maxZoom : 13
25- } ) ;
26- $scope . layer = Esri_OceanBasemap . addTo ( $scope . map ) ;
21+ var CartoDB_Voyager = L . tileLayer ( 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/rastertiles/voyager/{z}/{x}/{y}{r}.png' , {
22+ attribution : '© <a href="http ://www.openstreetmap.org/copyright">OpenStreetMap</a> © <a href="http://cartodb.com/attributions">CartoDB</a>' ,
23+ subdomains : 'abcd ' ,
24+ maxZoom : 19
25+ } ) ;
26+ $scope . layer = CartoDB_Voyager . addTo ( $scope . map ) ;
2727 // $scope.layer = L.tileLayer('http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png', {
2828 // maxZoom: 18,
2929 // attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
@@ -33,14 +33,14 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
3333 if ( feature . exp )
3434 {
3535 if ( feature . exp . experienceType == "work" )
36- return { color : "#4A14CC" }
36+ return { " color" "#4A14CC" , "weight" : 2 , "fillOpacity" : 0.1 , "fill" : true , "dashArray" : [ 1 , 2 , 3 , 4 , 4 , 5 , 6 ] }
3737 else if ( feature . exp . experienceType == "bornAndRaised" )
38- return { color : "#817799" }
38+ return { " color" "#817799" , "weight" : 2 , "fillOpacity" : 0.1 , "fill" : true , "dashArray" : [ 1 , 2 , 3 , 4 , 4 , 5 , 6 ] }
3939 else if ( feature . exp . experienceType == "study" )
40- return { color : "#E6FF00" }
40+ return { " color" "#E6FF00" , "weight" : 2 , "fillOpacity" : 0.1 , "fill" : true , "dashArray" : [ 1 , 2 , 3 , 4 , 4 , 5 , 6 ] }
4141 }
4242 else if ( feature . proj ) {
43- return { color : "#00FF00" }
43+ return { " color" "#00FF00" , "weight" : 2 , "fillOpacity" : 0.1 , "fill" : true , "dashArray" : [ 1 , 2 , 3 , 4 , 4 , 5 , 6 ] }
4444 }
4545 else return { color : "#000000" }
4646 }
@@ -123,19 +123,35 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
123123 // $scope.markersLayer.addLayer(marker)
124124 markerIcon = $scope . getMarkerIcon ( icontype )
125125 var marker = L . marker ( [ location . lat , location . long ] , { icon : markerIcon } ) //.addTo($scope.map);
126+ var title = "" ;
127+ if ( proj ) title = "PROJECT" ;
128+ else if ( exp )
129+ {
130+ switch ( exp . experienceType ) {
131+ case "work" :
132+ title = "JOB" ;
133+ break ;
134+ case "study" :
135+ title = "EDUCATION" ;
136+ break ;
137+ default :
138+ "" ;
139+ }
140+ }
126141 var popuphtml = `<div>
142+ <div style = "text-align:center"><u><strong>${ title }
127143 <img src = '${ markerIcon . options . iconUrl }
128144 if ( location . website )
129145 popuphtml += `<strong><a href= "${ location . website } ${ location . place } ${ location . city } ;
130146 else popuphtml += `<strong>${ location . place } ${ location . city }
131147 if ( exp ) popuphtml += `<u>Description: </u>${ exp . description }
132-
148+
133149 ${ exp . from } ${ exp . to ? "to " + exp . to :"" }
134-
150+
135151 </div>`
136- else
152+ else
137153 {
138- popuphtml += `<u>Project:</u> <a href = "${ proj . website } ${ proj . name }
154+ popuphtml += `<u>Project name :</u> <a href = "${ proj . website } ${ proj . name }
139155 <u>Description:</u>${ proj . description } ;
140156 if ( proj . tools )
141157 popuphtml += `<br/><u>Tools used:</u> ${ proj . tools . join ( ", " ) } ;
0 commit comments