Merge lp:~meese/pantheon-photos/fix-1273847 into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

Adds maps to photos.
-Metadata sidebar map widget that can be double clicked to set a GPS location in the photo's DB

-Interactive map page that can be accessed from the library sidebar. Automagically groups photo markers that overlap locations and displays thumbnails when markers are clicked. Clicking the thumbnails will switch to a collection view of all the photos in the group.

-libchamplain and clutter are required to build/use

[Cody Garver (codygarver)]

Breaks Photo Viewer for me, refuses to launch when I try to open an image with it.

Can you lock the map min height to the height of its area in the window? Here's are 2 screenshots, the first one is current minimum dimensions of the map, the second is closer to what I propose.

review: Needs Fixing

[Cody Garver (codygarver)]

Maybe it's more elegant to lock the min width instead, so the map is always covering all of its area

[Cody Garver (codygarver)]

Toggling the search causes the map to flash and sometimes go completely black until I toggle a few more times

[Cody Garver (codygarver)]

I think aerial map is a better default than geographical

[meese (meese)]

>Can you lock the map min height to the height of its area in the window? Here's are 2 screenshots, >the first one is current minimum dimensions of the map, the second is closer to what I propose.
I think you forgot to attach the screenshots.

The problem with locking to height is the view size will change while you're clicking through photos because of different amounts of exif information. What would be best I think is to lock to both with a ratio with a Gtk.AspectFrame, which I tried and it kinda worked but champlain did not play nice with it and would keep adding giant amounts of padding to both sides, I'll try to figure it out..

Still working on the flicker issues.

[Danielle Foré (danrabbit)]

Can we default to "Geographical" view instead of "Aerial" view?

I think we should ditch "relief" view. I'm not sure that's useful. Also all these extra views in the right click menu. I don't think "cloud" view is relevant to photos.

It looks like there is an extra frame around the view. Can we remove that?

The default view is zoomed out to the whole world. That's a little much. We should do like Facebook and zoom just so that we show all the places you have photos. And I guess if you have 0 locations we should not show the "Places" item like we don't show "Flagged" etc.

If a photo doesn't have a location, we should ask them to add a location by searching for its name (ie: Yosemite National Park) instead of trying to click a location (which will always be inaccurate).

review: Needs Fixing

[meese (meese)]

All are fixed now.

[meese (meese)]

Also the geo locations are loaded into the db on the first run which takes about 10-20 seconds. Not something a new user will be likely to run into but for a tester the geo search completion won't be fully loaded until it's done.

[Danielle Foré (danrabbit)]

Hm, is it possible to get the names of places (restaurants, buildings, etc) in addition to just cities? It looks like Maya can do this.

Also, once we've confirmed a location we should probably zoom in more on that location. I can see almost my whole state from the current zoom level :p

Can we also get the same location marker image from Maya?

[meese (meese)]

Ohh did not know Maya had maps too. Will do.

[lp:~meese/pantheon-photos/fix-1273847]

2578. By meese on 2014-09-13

change gps markers to icons from Maya. Make default zoom in closer

[meese (meese)]

Hey it looks like Maya is actually going searching through your contacts list to find address information to give you things like restaurants and such. Dunno if we want to add something like that to photos?

I just fixed the other two though.

[lp:~meese/pantheon-photos/fix-1273847]

2579. By meese on 2014-09-13

add places icon for sidebar

[Danielle Foré (danrabbit)]

Yeah I think it makes sense that anything you can search for in one place we should be able to search in another place.

[meese (meese)]

And I was wrong actually it will do straight street addresses. Auto complete in Maya doesn't seem to bring anything up for me though does it for you?

[lp:~meese/pantheon-photos/fix-1273847]

2580. By meese on 2014-09-15

search changes from review

[meese (meese)]

Fixed hitting enter in the entry box does what Maya does and uses the Geocode lib that hits the web and grabs the closest match and contacts addresses are added to the auto complete. Slightly different though it still uses an offline location list for non contacts auto complete instead of using the geocode lib as I found the lookup was generally too slow and made it feel unresponsive.

[Danielle Foré (danrabbit)]

It looks like it does find the place on hitting enter. Is there are way to have locations appear in the auto-complete? If not, maybe we should ditch the auto-complete. As you're typing in a location it kind of feels like you're being told that it can't find what you're looking for even though it will find it on pressing enter.

Can we zoom in more in the sidebar? I feel like we're still really far away from a specific location.

I've also noticed that once a location is set, hitting "clear" clears the entry but doesn't remove that location tag. It doesn't appear to be possible to untag a photo's location.

It also looks like the location marker is positioned incorrectly. The location appears to be under the top/left (maybe?) of the marker instead of bottom center.

[lp:~meese/pantheon-photos/fix-1273847]

2581. By meese on 2014-09-20

fixes

[meese (meese)]

Fixed.

For the search stuff, yeah I had already written it for grabbing the locations from the geocode library for auto complete and I changed it back and it falls back to the offline auto complete now. It can be a little slow to come up but it sounds like that's better than using a different list for hitting enter vs auto complete.

[lp:~meese/pantheon-photos/fix-1273847]

2582. By meese on 2014-10-17

merge

2583. By meese on 2014-10-18

merge fix

[Danielle Foré (danrabbit)]

Hm there seems to be no indication (in the sidebar) that a search for the location is in progress. Can we either show the map sooner or have a gtk.spinner or something?

Also, the sidebar map needs to be WAY more zoomed in if it's matching to a building. It's showing at like half a European country size instead of at like a city block size

The map view is still super zoomed out by default and nowhere near where my photos are :p

Yay that it finds places now :D

Unmerged revisions

2583. By meese on 2014-10-18

merge fix

2582. By meese on 2014-10-17

merge

2581. By meese on 2014-09-20

fixes

2580. By meese on 2014-09-15

search changes from review

2579. By meese on 2014-09-13

add places icon for sidebar

2578. By meese on 2014-09-13

change gps markers to icons from Maya. Make default zoom in closer

2577. By meese on 2014-09-11

adds location search entry for setting gps markers and other fixes from review

2576. By meese on 2014-09-09

change back to geographic map for default, make page not visible if no photos have gps data, remove page border, trim down extra map options

2575. By meese on 2014-09-08

merge from trunk

2574. By meese on 2014-09-02

spelling fix

=== modified file 'Makefile'
--- Makefile	2014-09-27 09:20:58 +0000
+++ Makefile	2014-10-18 00:49:47 +0000
@@ -143,7 +143,9 @@
 	tag_sidebar_context.ui \
 	tags.ui \
 	top.ui \
-	trash.ui 
+	trash.ui \
+	locations.dat \
+	map.ui
 
 SYS_INTEGRATION_FILES = \
 	shotwell.appdata.xml \
@@ -171,10 +173,13 @@
 
 ICON_FILES = \
 	drag_nub.png \
+	gps-marker.svg \
+	gps-marker-selected.svg \
 	image-adjust.svg \
 	noninterpretable-video.png \
 	pin-toolbar.svg \
-	sprocket.png
+	sprocket.png \
+	places.svg
 
 HELP_FILES = \
 	edit-adjustments.page \
@@ -236,6 +241,10 @@
 
 EXT_PKGS = \
 	atk \
+	champlain-0.12 \
+	champlain-gtk-0.12 \
+	clutter-1.0 \
+	clutter-gtk-1.0 \
 	gdk-3.0 \
 	gee-0.8 \
 	gexiv2 \
@@ -255,7 +264,9 @@
 	libsoup-2.4 \
 	libxml-2.0 \
 	sqlite3 \
-	webkitgtk-3.0
+	webkitgtk-3.0 \
+	geocode-glib-1.0 \
+	folks
 	
 ifdef UNITY_SUPPORT
 EXT_PKGS += unity
@@ -270,6 +281,10 @@
 DIRECT_LIBS =
 
 EXT_PKG_VERSIONS = \
+	champlain-0.12 >= 0.12.3 \
+	champlain-gtk-0.12 >= 0.12.3 \
+	clutter-1.0 >= 1.12.0 \
+	clutter-gtk-1.0 >= 1.0.0 \
 	gee-0.8 >= 0.8.5 \
 	gexiv2 >= 0.4.90 \
 	gio-unix-2.0 >= 2.20 \
@@ -288,7 +303,9 @@
 	libxml-2.0 >= 2.6.32 \
 	rest-0.7 >= 0.7 \
 	sqlite3 >= 3.5.9 \
-	webkitgtk-3.0 >= 1.4.0 
+	webkitgtk-3.0 >= 1.4.0 \
+	geocode-glib-1.0 >= 1.0
+	folks >= 0.9.0
 
 DIRECT_LIBS_VERSIONS =
 
@@ -640,6 +657,12 @@
 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled
 	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
 
+FASTFLAGS = --target-glib=2.32 --thread --enable-experimental --disable-warnings
+fast: CFLAGS = -w -pipe  -O0
+fast: VALAFLAGS = $(FASTFLAGS)
+-j3 fast:  $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) misc/gschemas.compiled
+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $(PROGRAM)
+
 misc/gschemas.compiled: $(SCHEMA_FILES)
 	rm -f misc/gschemas.compiled
 	glib-compile-schemas misc

=== added file 'icons/earth_map.svg'
--- icons/earth_map.svg	1970-01-01 00:00:00 +0000
+++ icons/earth_map.svg	2014-10-18 00:49:47 +0000
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="48"
+   height="48"
+   id="svg3759"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="internet-web-browser.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview36"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3759" />
+  <metadata
+     id="metadata37">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3761">
+    <radialGradient
+       cx="17.81411"
+       cy="24.149399"
+       r="9.125"
+       fx="17.81411"
+       fy="24.149399"
+       id="radialGradient2418"
+       xlink:href="#linearGradient4845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.643979,0,2.93653e-8,2.534421,78.72514,-37.986139)" />
+    <linearGradient
+       id="linearGradient4845">
+      <stop
+         id="stop4847"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4849"
+         style="stop-color:#b6b6b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="62.200409"
+       y1="-12.489107"
+       x2="62.200409"
+       y2="-1.4615115"
+       id="linearGradient3697"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1153734,0,0,2.1153252,-107.57708,31.426557)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="61.240059"
+       cy="-8.7256308"
+       r="9.7552834"
+       fx="61.240059"
+       fy="-8.7256308"
+       id="radialGradient3705"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,3.5234091,-3.5234073,0,-6.7439676,-205.79862)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
+      <stop
+         id="stop4627"
+         style="stop-color:#51cfee;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4629"
+         style="stop-color:#49a3d2;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop4631"
+         style="stop-color:#3470b4;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop4633"
+         style="stop-color:#273567;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="43"
+       x2="20"
+       y2="2.6887112"
+       id="linearGradient3713"
+       xlink:href="#linearGradient3707-319-631"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.98001402,0,0,0.97999168,0.08994011,0.8703621)" />
+    <linearGradient
+       id="linearGradient3707-319-631">
+      <stop
+         id="stop4637"
+         style="stop-color:#254b6d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4639"
+         style="stop-color:#415b73;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4641"
+         style="stop-color:#6195b5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8838">
+      <stop
+         id="stop8840"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="62.625"
+       cy="4.625"
+       r="10.625"
+       fx="62.625"
+       fy="4.625"
+       id="radialGradient3757"
+       xlink:href="#linearGradient8838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.341176,0,3.047059)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4873"
+       id="linearGradient3017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1153734,0,0,2.1153252,-107.57708,31.426557)"
+       x1="62.200409"
+       y1="-12.489107"
+       x2="62.200409"
+       y2="-1.4615115" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
+       id="radialGradient3021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,3.5234091,-3.5234073,0,-6.7439676,-205.79862)"
+       cx="61.240059"
+       cy="-8.7256308"
+       fx="61.240059"
+       fy="-8.7256308"
+       r="9.7552834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3707-319-631"
+       id="linearGradient3023"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.98001402,0,0,0.97999168,0.08994011,0.8703621)"
+       x1="20"
+       y1="43"
+       x2="20"
+       y2="2.6887112" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8838"
+       id="radialGradient3026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1647059,0,0,0.87466073,-111.56471,34.661405)"
+       cx="62.625"
+       cy="4.625"
+       fx="62.625"
+       fy="4.625"
+       r="10.625" />
+  </defs>
+  <path
+     style="opacity:0.4;fill:url(#radialGradient3026);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="path8836"
+     inkscape:connector-curvature="0"
+     d="m 46.999997,38.706716 a 23,9.2932831 0 0 1 -46.0000002,0 23,9.2932831 0 1 1 46.0000002,0 z" />
+  <path
+     style="fill:url(#radialGradient3021);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3023);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path6495"
+     inkscape:connector-curvature="0"
+     d="M 43.500003,23.999309 C 43.500003,34.769208 34.768912,43.5 24.000248,43.5 13.230599,43.5 4.5000032,34.769109 4.5000032,23.999309 4.5000032,13.229904 13.230599,4.5 24.000248,4.5 c 10.768664,0 19.499755,8.729904 19.499755,19.499309 l 0,0 z" />
+  <path
+     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path6534"
+     inkscape:connector-curvature="0"
+     d="m 24.329633,5.218182 -2.362344,0.2704567 -2.59858,0.7099494 c 0.221353,-0.077615 0.445595,-0.1623374 0.674956,-0.2366499 L 19.739934,5.4210246 18.727501,5.5900601 18.221284,6.0633596 17.445085,6.1647809 16.736382,6.502852 16.398905,6.6718876 16.29766,6.807116 15.791444,6.9085373 15.487716,7.5508723 15.08274,6.7395017 l -0.134989,0.3380711 0.0675,0.9127919 -0.641208,0.5409137 -0.371225,0.9804061 0.7762,0 0.303728,-0.642335 0.101245,-0.2366498 c 0.341288,-0.241775 0.66483,-0.5110331 1.012433,-0.7437563 l 0.809946,0.2704568 c 0.527335,0.3588995 1.058376,0.7234732 1.586147,1.0818274 L 19.368709,8.5312784 18.491266,8.1594002 18.086294,7.3480297 16.601391,7.1789941 16.567641,7.0099586 17.208847,7.145187 17.580075,6.7733087 18.390021,6.6042734 C 18.581694,6.5108897 18.770243,6.44363 18.963732,6.3676236 l -0.506216,0.4732995 1.82238,1.250863 0,0.7437562 -0.708703,0.7099493 0.944937,1.8931994 0.641208,-0.371881 0.809948,-1.2508614 c 1.138725,-0.3526792 2.165016,-0.7630693 3.239789,-1.2508632 l -0.0675,0.4732995 0.539963,0.3718782 0.944939,-0.6423349 -0.47247,-0.5409137 -0.641209,0.3718781 -0.202486,-0.067613 c 0.04651,-0.02129 0.08828,-0.045973 0.13499,-0.067613 L 26.388247,6.0295525 24.329633,5.218182 z m -9.246893,3.6511675 0.776199,0.5409136 0.641209,0 0,-0.6423349 L 15.72395,8.429857 15.08274,8.8693495 z M 33.002811,8.429857 31.619153,8.7679282 30.741712,9.342649 l 0,0.5071058 -1.383659,0.8789842 0.269983,1.31848 0.809946,-0.574723 0.506216,0.574723 0.573714,0.338071 0.371224,-0.980408 -0.202486,-0.57472 0.202486,-0.405687 0.809948,-0.7437548 0.371225,0 -0.371225,0.8113728 0,0.743754 c 0.333836,-0.09103 0.6708,-0.126483 1.012433,-0.169037 l -0.944938,0.676145 -0.0675,0.405683 -1.079929,0.912794 -1.113678,-0.270459 0,-0.642335 -0.506216,0.338072 0.236235,0.574722 -0.809947,0 -0.438721,0.743756 -0.539965,0.608528 -0.978685,0.202842 0.573712,0.574721 0.134991,0.57472 -0.708703,0 -0.944938,0.507108 0,1.48751 0.438721,0 0.404973,0.439494 0.91119,-0.439494 0.337478,-0.912791 0.674956,-0.405685 0.134991,-0.338071 1.079928,-0.270457 0.60746,0.676142 0.641209,0.338071 -0.371227,0.743758 0.573715,-0.169037 0.303728,-0.743757 -0.74245,-0.845177 0.303729,0 0.742451,0.608528 0.134992,0.811371 0.641207,0.743757 0.168739,-1.081827 0.337478,-0.169037 c 0.359225,0.373574 0.642383,0.83043 0.944938,1.250864 l 1.113677,0.06762 0.641207,0.405686 -0.303729,0.439492 -0.641208,0.574721 -0.944939,0 -1.248667,-0.405684 -0.641208,0.06762 -0.472469,0.540915 -1.349912,-1.352286 -0.944937,-0.270456 -1.383659,0.169036 -1.21492,0.33807 c -0.693063,0.7871 -1.402636,1.582869 -2.058616,2.400307 l -0.776198,1.893195 0.371226,0.405687 -0.674956,0.980406 0.742451,1.724162 c 0.617799,0.700089 1.239228,1.395452 1.856128,2.09604 l 0.91119,-0.777564 0.371226,0.473301 0.978687,-0.642335 0.337477,0.371878 0.978685,0 0.573713,0.642335 -0.337478,1.149442 0.674955,0.777564 -0.03375,1.352283 0.506216,0.980406 -0.371225,0.845178 c -0.03619,0.60617 -0.0675,1.18551 -0.0675,1.791777 0.297757,0.821342 0.59628,1.640668 0.877443,2.467918 l 0.202487,1.318476 0,0.676143 0.539963,0 0.7762,-0.507106 0.944939,0 1.417406,-1.588934 -0.168739,-0.540915 0.944939,-0.845177 -0.708705,-0.777563 0.843694,-0.676141 0.809948,-0.507109 0.371225,-0.405685 -0.236234,-0.912791 c 0,-0.768475 2e-6,-1.530306 0,-2.298884 l 0.641209,-1.419897 0.809945,-0.878985 0.877443,-2.163655 0,-0.574721 c -0.436643,0.0551 -0.855168,0.10478 -1.282416,0.13523 l 0.877442,-0.878986 1.21492,-0.81137 0.641209,-0.743758 0,-0.811369 C 41.631793,22.01604 41.484928,21.720356 41.338501,21.44561 l -0.573712,0.676141 -0.438721,-0.507105 -0.641209,-0.507107 0,-1.048021 0.742452,0.845178 0.843696,-0.101421 c 0.380615,0.346139 0.746089,0.65392 1.079927,1.04802 l 0.539978,-0.608545 c 0,-0.655131 -0.736573,-3.889319 -2.328596,-6.626192 -1.592024,-2.735972 -4.387213,-5.240102 -4.387211,-5.240102 l -0.202488,0.3718783 -0.742451,0.8113707 -0.944937,-0.9804063 0.944937,0 L 35.668888,9.1059992 33.914003,8.7679282 33.002811,8.429857 z M 12.720395,8.8693495 12.382918,9.7483343 c 0,0 -0.590841,0.097717 -0.74245,0.1352286 -1.9362043,1.7873441 -5.8406714,5.6641681 -6.7495557,12.9481221 0.035987,0.168879 0.6412078,1.14944 0.6412078,1.14944 l 1.4849023,0.878986 1.4849024,0.405684 0.6412079,0.777564 0.9786853,0.743756 0.573712,-0.101421 0.404974,0.202844 0,0.135226 -0.539965,1.521321 -0.438721,0.642336 0.134991,0.304263 -0.3374777,1.217057 1.2486677,2.298882 1.282416,1.115635 0.573711,0.81137 -0.0675,1.690355 0.404974,0.946598 -0.404974,1.825586 c 0,0 -0.05404,-0.01501 0,0.169036 0.05452,0.184134 2.25593,1.422835 2.396091,1.318476 0.139681,-0.106305 0.269983,-0.202843 0.269983,-0.202843 l -0.13499,-0.405685 0.573712,-0.540913 0.202486,-0.574722 0.911191,-0.304265 0.708702,-1.757968 -0.202486,-0.4733 0.472468,-0.743756 1.07993,-0.236649 0.539965,-1.28467 -0.134992,-1.588935 0.843695,-1.183247 0.13499,-1.217056 c -1.15759,-0.575052 -2.293316,-1.165913 -3.442272,-1.75797 l -0.573713,-1.115634 -1.046181,-0.23665 -0.573712,-1.521321 -1.383659,0.169035 -1.214921,-0.878983 -1.282415,1.115634 0,0.169036 C 10.716387,26.202752 10.261353,26.186409 9.9193333,25.975746 l -0.2699819,-0.811371 0,-0.878985 -0.8774423,0.101421 c 0.070612,-0.559892 0.1651315,-1.13056 0.2362324,-1.690355 l -0.5062167,0 -0.5062167,0.642335 -0.4724689,0.23665 -0.7087034,-0.405685 -0.067496,-0.878985 0.1349912,-0.946599 1.0461812,-0.811371 0.8436945,0 0.1687389,-0.473299 1.0461817,0.236648 0.7761987,0.980407 0.134991,-1.622742 1.349911,-1.115633 0.472468,-1.183248 1.012435,-0.405685 0.539964,-0.811372 1.282416,-0.23665 0.641208,-0.946599 c -0.634667,0 -1.288957,0 -1.923624,0 l 1.214921,-0.574721 0.843693,0 1.07993,-0.371877 0.202487,1.04802 0.472469,-0.743757 -0.539966,-0.371878 0.134992,-0.439491 -0.438721,-0.405687 -0.47247,-0.135228 0.134992,-0.507106 -0.371226,-0.709948 -0.843695,0.33807 0.134992,-0.642334 -0.978686,-0.574722 -0.776198,1.352284 0.0675,0.4733 -0.776198,0.338071 -0.472469,1.04802 -0.236234,-0.980407 -1.316164,-0.540913 -0.236234,-0.743756 1.788632,-1.014213 0.776198,-0.743757 0.0675,-0.8789846 -0.438721,-0.2366498 -0.573713,-0.067613 z m 14.477799,1.6227435 0,0.54091 0.30373,0.338072 0,0.811371 -0.168739,1.081827 0.877442,-0.169036 0.641209,-0.642334 -0.573713,-0.540915 c -0.186049,-0.496308 -0.3746,-0.943871 -0.607459,-1.419895 l -0.47247,0 z m -0.742452,1.081824 -0.539963,0.169038 0.13499,0.980405 0.708703,-0.371881 -0.30373,-0.777562 z m 9.888101,8.89127 0.809946,0.946598 0.978686,2.096042 0.607459,0.67614 -0.303728,0.709952 0.539964,0.642335 c -0.247792,0.01643 -0.487764,0.03381 -0.742451,0.03381 -0.462673,-0.973935 -0.828843,-1.956133 -1.181173,-2.975025 l -0.60746,-0.676142 -0.337478,-1.217056 0.236235,-0.23665 z" />
+  <path
+     style="opacity:0.4;fill:none;stroke:url(#linearGradient3017);stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path8655"
+     inkscape:connector-curvature="0"
+     d="m 42.500001,23.999343 c 0,10.217597 -8.283342,18.500655 -18.499766,18.500655 -10.217359,0 -18.5002317,-8.283152 -18.5002317,-18.500655 0,-10.217125 8.2828727,-18.4993427 18.5002317,-18.4993427 10.216424,0 18.499766,8.2822177 18.499766,18.4993427 l 0,0 z" />
+</svg>

=== added file 'icons/gps-marker-selected.svg'
--- icons/gps-marker-selected.svg	1970-01-01 00:00:00 +0000
+++ icons/gps-marker-selected.svg	2014-10-18 00:49:47 +0000
@@ -0,0 +1,1388 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="23"
+   height="33"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="gps-marker selected.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1335"
+     id="namedview189"
+     showgrid="false"
+     inkscape:zoom="10.11377"
+     inkscape:cx="44.615873"
+     inkscape:cy="25.262848"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4291">
+      <stop
+         offset="0"
+         style="stop-color:#242424;stop-opacity:1"
+         id="stop4293" />
+      <stop
+         offset="1"
+         style="stop-color:#242424;stop-opacity:0"
+         id="stop4295" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4279">
+      <stop
+         offset="0"
+         style="stop-color:#006390;stop-opacity:1"
+         id="stop4281" />
+      <stop
+         offset="1"
+         style="stop-color:#004667;stop-opacity:0.99795502"
+         id="stop4283" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4269">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop4271" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop4273" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop4275" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop4277" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop4875" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0"
+         id="stop4877" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.51455032,0,0,0.51453856,-24.005236,9.8064595)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4873"
+       id="linearGradient3683"
+       y2="5.4675598"
+       x2="63.397362"
+       y1="-12.489107"
+       x1="63.397362" />
+    <linearGradient
+       id="linearGradient3603">
+      <stop
+         offset="0"
+         style="stop-color:#00b063;stop-opacity:1"
+         id="stop3605" />
+      <stop
+         offset="1"
+         style="stop-color:#00f246;stop-opacity:1"
+         id="stop3607" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.2703533,0,0,0.27035337,1.5115215,1.5115197)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3603"
+       id="linearGradient3730"
+       y2="3.0816143"
+       x2="18.379412"
+       y1="44.980297"
+       x1="18.379412" />
+    <linearGradient
+       id="linearGradient3690">
+      <stop
+         offset="0"
+         style="stop-color:#37fff7;stop-opacity:1"
+         id="stop3692" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#21fee4;stop-opacity:1"
+         id="stop3694" />
+      <stop
+         offset="0.66093999"
+         style="stop-color:#08fea6;stop-opacity:1"
+         id="stop3696" />
+      <stop
+         offset="1"
+         style="stop-color:#00dd65;stop-opacity:1"
+         id="stop3698" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,0.64524082,-0.85170617,0,11.39831,-13.333564)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3690"
+       id="radialGradient3728"
+       fy="3.9900031"
+       fx="23.895569"
+       r="20.397499"
+       cy="3.9900031"
+       cx="23.895569" />
+    <radialGradient
+       gradientTransform="matrix(0,117.18262,-143.86282,0,1693.1125,-1069.0711)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7"
+       id="radialGradient4065"
+       fy="9.9571075"
+       fx="7.1183534"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.1183534" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7">
+      <stop
+         offset="0"
+         style="stop-color:#00699b;stop-opacity:1"
+         id="stop3750-1-0-7-6-6-1-3-9-3-7" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#005176;stop-opacity:1"
+         id="stop3752-3-7-4-0-32-8-923-0-7-3" />
+      <stop
+         offset="0.704952"
+         style="stop-color:#002955;stop-opacity:1"
+         id="stop3754-1-8-5-2-7-6-7-1-9-6" />
+      <stop
+         offset="1"
+         style="stop-color:#242424;stop-opacity:1"
+         id="stop3756-1-6-2-6-6-1-96-6-0-1" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,117.18262,-143.86282,0,1693.1125,-1069.0711)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7"
+       id="radialGradient3249-0"
+       fy="9.9571075"
+       fx="7.1183534"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.1183534" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3897" />
+      <stop
+         offset="0.05263157"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3899" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3901" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3903" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.9999922)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3680-6-6-6-3"
+       id="linearGradient4183"
+       y2="13.000008"
+       x2="20"
+       y1="26.000008"
+       x1="20" />
+    <linearGradient
+       id="linearGradient3680-6-6-6-3">
+      <stop
+         offset="0"
+         style="stop-color:#28bbfe;stop-opacity:1"
+         id="stop3682-4-6-1-3" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3684-8-5-8-0" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(4e-6,1.0000062)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1"
+       id="linearGradient3982"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924-1">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3926-3" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3928-91" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3930-6" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3932-6" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-166-749-4"
+       id="radialGradient3963"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-166-749-4">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2883-3" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2885-2" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-3"
+       id="radialGradient3965"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-464-309-3">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2889-6" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2891-2" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-501-757-2"
+       id="linearGradient3967"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       id="linearGradient3702-501-757-2">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2895-3" />
+      <stop
+         offset="0.5"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2897-0" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2899-1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.9999922)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3680-6-6-6-3"
+       id="linearGradient3018"
+       y2="13.000008"
+       x2="20"
+       y1="26.000008"
+       x1="20" />
+    <radialGradient
+       gradientTransform="matrix(0,9.4975523,-11.65996,0,140.93055,-79.160978)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8"
+       id="radialGradient3031"
+       fy="9.9571075"
+       fx="6.2001843"
+       r="12.671875"
+       cy="9.9571075"
+       cx="6.7304144" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8">
+      <stop
+         offset="0"
+         style="stop-color:#19ffe8;stop-opacity:1"
+         id="stop3750-1-0-7-6-6-1-3-9" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#00da8e;stop-opacity:1"
+         id="stop3752-3-7-4-0-32-8-923-0" />
+      <stop
+         offset="0.704952"
+         style="stop-color:#008545;stop-opacity:1"
+         id="stop3754-1-8-5-2-7-6-7-1" />
+      <stop
+         offset="1"
+         style="stop-color:#008f68;stop-opacity:1"
+         id="stop3756-1-6-2-6-6-1-96-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#00699b;stop-opacity:1"
+         id="stop3750-1-0-7-6-6-1-3-9-3" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#005176;stop-opacity:1"
+         id="stop3752-3-7-4-0-32-8-923-0-7" />
+      <stop
+         offset="0.704952"
+         style="stop-color:#002955;stop-opacity:1"
+         id="stop3754-1-8-5-2-7-6-7-1-9" />
+      <stop
+         offset="1"
+         style="stop-color:#242424;stop-opacity:1"
+         id="stop3756-1-6-2-6-6-1-96-6-0" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,9.4975523,-11.65996,0,136.43054,-84.660973)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
+       id="radialGradient3077"
+       fy="9.9571075"
+       fx="6.2001843"
+       r="12.671875"
+       cy="9.9571075"
+       cx="6.7304144" />
+    <linearGradient
+       id="linearGradient3680-6-6-6-3-7">
+      <stop
+         offset="0"
+         style="stop-color:#28bbfe;stop-opacity:1"
+         id="stop3682-4-6-1-3-7" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3684-8-5-8-0-2" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-20,-24.000008)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3680-6-6-6-3-7"
+       id="linearGradient3950"
+       y2="13.000008"
+       x2="20"
+       y1="26.000008"
+       x1="20" />
+    <radialGradient
+       gradientTransform="matrix(0,85.484079,-104.94714,0,1299.7805,-832.8559)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242"
+       id="radialGradient3104"
+       fy="9.9941158"
+       fx="8.276144"
+       r="12.671875"
+       cy="9.9941158"
+       cx="8.276144" />
+    <linearGradient
+       gradientTransform="translate(5.3e-6,1.0000015)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-3"
+       id="linearGradient4181"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924-3">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3926-7" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3928-3" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3930-7" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3932-1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.7037037,0,0,0.7037037,-39.333369,2.4814295)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5803-2-7"
+       id="linearGradient4907-4"
+       y2="54.780239"
+       x2="167.98311"
+       y1="8.50811"
+       x1="167.98311" />
+    <linearGradient
+       id="linearGradient5803-2-7">
+      <stop
+         offset="0"
+         style="stop-color:#49cefe;stop-opacity:1"
+         id="stop5805-3-6" />
+      <stop
+         offset="1"
+         style="stop-color:#37c1ff;stop-opacity:1"
+         id="stop5807-0-0" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,6.6677582,-8.1858766,0,105.8829,-59.462774)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242"
+       id="radialGradient6305"
+       fy="9.9941158"
+       fx="8.276144"
+       r="12.671875"
+       cy="9.9941158"
+       cx="8.276144" />
+    <linearGradient
+       id="linearGradient3242">
+      <stop
+         offset="0"
+         style="stop-color:#00cbe6;stop-opacity:1"
+         id="stop3244" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#008ea8;stop-opacity:1"
+         id="stop3246" />
+      <stop
+         offset="0.66093999"
+         style="stop-color:#003b79;stop-opacity:1"
+         id="stop3248" />
+      <stop
+         offset="1"
+         style="stop-color:#050077;stop-opacity:1"
+         id="stop3250" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-166-749"
+       id="radialGradient3013"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-166-749">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2883" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2885" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309"
+       id="radialGradient3015"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-464-309">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2889" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2891" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-501-757">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2895" />
+      <stop
+         offset="0.5"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2897" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2899" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-501-757"
+       id="linearGradient3141"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       spreadMethod="pad"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,158.172)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient152"
+       id="linearGradient3288"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0" />
+    <linearGradient
+       spreadMethod="pad"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,158.172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient152"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         offset="0"
+         style="stop-color:#00f086;stop-opacity:1"
+         id="stop154" />
+      <stop
+         offset="1"
+         style="stop-color:#007079;stop-opacity:1"
+         id="stop156" />
+    </linearGradient>
+    <clipPath
+       id="clipPath148">
+      <path
+         id="path150"
+         d="m 73.0625,1288.75 0,-1064.57 3694.7075,0 0,1075.02 c 0,0 -615.78,365.29 -1742.98,365.29 -1127.2,0 -1951.7275,-375.74 -1951.7275,-375.74" />
+    </clipPath>
+    <linearGradient
+       spreadMethod="pad"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,508.172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient22"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         offset="0"
+         style="stop-color:#00f086;stop-opacity:1"
+         id="stop24" />
+      <stop
+         offset="1"
+         style="stop-color:#007079;stop-opacity:1"
+         id="stop26" />
+    </linearGradient>
+    <clipPath
+       id="clipPath18">
+      <path
+         id="path20"
+         d="m 73.0625,4788.75 0,-1064.57 3694.7075,0 0,1075.02 c 0,0 -615.78,365.29 -1742.98,365.29 -1127.2,0 -1951.7275,-375.74 -1951.7275,-375.74" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient3702-501-757-5">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2895-5" />
+      <stop
+         offset="0.5"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2897-1" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2899-4" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-501-757-5"
+       id="linearGradient3086"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       id="linearGradient3688-464-309-87">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2889-5" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2891-5" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-87"
+       id="radialGradient3084"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3688-166-749-1">
+      <stop
+         offset="0"
+         style="stop-color:#004063;stop-opacity:1"
+         id="stop2883-79" />
+      <stop
+         offset="1"
+         style="stop-color:#004063;stop-opacity:0"
+         id="stop2885-4" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-166-749-1"
+       id="radialGradient3082"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <linearGradient
+       id="linearGradient3242-6">
+      <stop
+         offset="0"
+         style="stop-color:#00cbe6;stop-opacity:1"
+         id="stop3244-9" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#008ea8;stop-opacity:1"
+         id="stop3246-9" />
+      <stop
+         offset="0.66093999"
+         style="stop-color:#003b79;stop-opacity:1"
+         id="stop3248-9" />
+      <stop
+         offset="1"
+         style="stop-color:#050077;stop-opacity:1"
+         id="stop3250-9" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,3.248395,-3.9879912,0,51.891669,-37.148511)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242-6"
+       id="radialGradient4680-7"
+       fy="9.9941158"
+       fx="8.276144"
+       r="12.671875"
+       cy="9.9941158"
+       cx="8.276144" />
+    <linearGradient
+       id="linearGradient5803-2-7-5">
+      <stop
+         offset="0"
+         style="stop-color:#49cefe;stop-opacity:1"
+         id="stop5805-3-6-4" />
+      <stop
+         offset="1"
+         style="stop-color:#37c1ff;stop-opacity:1"
+         id="stop5807-0-0-9" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.33333333,0,0,0.33333333,-18.000021,-6.6666402)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5803-2-7-5"
+       id="linearGradient5041-7"
+       y2="54.780239"
+       x2="167.98311"
+       y1="8.50811"
+       x1="167.98311" />
+    <linearGradient
+       id="linearGradient3924-1-2">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3926-5" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3928-32" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3930-1" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3932-3" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.9729689,-7.0270212)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1-2"
+       id="linearGradient4160"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.9729689,-7.0270212)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1-2-6"
+       id="linearGradient4160-4"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3926-5-5" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3928-32-3" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3930-1-7" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3932-3-0" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269"
+       id="linearGradient4207-1"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924-1-2-6-0">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop3926-5-5-3" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop3928-32-3-6" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop3930-1-7-2" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop3932-3-0-9" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,-2.0270504,-2.0270449)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1-2-6-0"
+       id="linearGradient4247"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279"
+       id="linearGradient4285"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <radialGradient
+       gradientTransform="matrix(1,0,0,0.25,0,23.248598)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4291"
+       id="radialGradient4297"
+       fy="30.998131"
+       fx="11.325233"
+       r="7.0953269"
+       cy="30.998131"
+       cx="11.325233" />
+    <filter
+       id="filter4345"
+       color-interpolation-filters="sRGB"
+       height="1.1956567"
+       width="1.3103333"
+       y="-0.097828373"
+       x="-0.15516667">
+      <feGaussianBlur
+         stdDeviation="0.4655"
+         id="feGaussianBlur4347" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-2"
+       id="linearGradient4285-7"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-2">
+      <stop
+         offset="0"
+         style="stop-color:#006390;stop-opacity:1"
+         id="stop4281-4" />
+      <stop
+         offset="1"
+         style="stop-color:#004667;stop-opacity:0.99795502"
+         id="stop4283-7" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9"
+       id="linearGradient4207-1-1"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop4271-5" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop4273-3" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop4275-1" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop4277-8" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9"
+       id="linearGradient4027"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304"
+       id="linearGradient4285-683"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304">
+      <stop
+         offset="0"
+         style="stop-color:#006390;stop-opacity:1"
+         id="stop10506" />
+      <stop
+         offset="1"
+         style="stop-color:#004667;stop-opacity:0.99795502"
+         id="stop10508" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0"
+       id="linearGradient4027-1"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0">
+      <stop
+         offset="0"
+         style="stop-color:#4bc7fe;stop-opacity:1"
+         id="stop10512" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4bc7fe;stop-opacity:0.23529412"
+         id="stop10514" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4bc7fe;stop-opacity:0.15686275"
+         id="stop10516" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc7fe;stop-opacity:0.39215687"
+         id="stop10518" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762"
+       id="linearGradient4285-683-622"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762">
+      <stop
+         offset="0"
+         style="stop-color:#00908b;stop-opacity:1"
+         id="stop10916" />
+      <stop
+         offset="1"
+         style="stop-color:#00675f;stop-opacity:0.99795502"
+         id="stop10918" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801"
+       id="linearGradient4027-1-210"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801">
+      <stop
+         offset="0"
+         style="stop-color:#4bfefd;stop-opacity:1"
+         id="stop10922" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4bfefd;stop-opacity:0.23529412"
+         id="stop10924" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4bfefd;stop-opacity:0.15686275"
+         id="stop10926" />
+      <stop
+         offset="1"
+         style="stop-color:#4bfefd;stop-opacity:0.39215687"
+         id="stop10928" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109"
+       id="linearGradient4285-683-622-67"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109">
+      <stop
+         offset="0"
+         style="stop-color:#006790;stop-opacity:1"
+         id="stop11346" />
+      <stop
+         offset="1"
+         style="stop-color:#004a67;stop-opacity:0.99795502"
+         id="stop11348" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68"
+       id="linearGradient4027-1-210-223"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68">
+      <stop
+         offset="0"
+         style="stop-color:#4bc8fe;stop-opacity:1"
+         id="stop11352" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4bc8fe;stop-opacity:0.23529412"
+         id="stop11354" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4bc8fe;stop-opacity:0.15686275"
+         id="stop11356" />
+      <stop
+         offset="1"
+         style="stop-color:#4bc8fe;stop-opacity:0.39215687"
+         id="stop11358" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461"
+       id="linearGradient4285-683-622-67-149"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461">
+      <stop
+         offset="0"
+         style="stop-color:#003a90;stop-opacity:1"
+         id="stop11796" />
+      <stop
+         offset="1"
+         style="stop-color:#002967;stop-opacity:0.99795502"
+         id="stop11798" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899"
+       id="linearGradient4027-1-210-223-322"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899">
+      <stop
+         offset="0"
+         style="stop-color:#4b93fe;stop-opacity:1"
+         id="stop11802" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4b93fe;stop-opacity:0.23529412"
+         id="stop11804" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4b93fe;stop-opacity:0.15686275"
+         id="stop11806" />
+      <stop
+         offset="1"
+         style="stop-color:#4b93fe;stop-opacity:0.39215687"
+         id="stop11808" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461-207"
+       id="linearGradient4285-683-622-67-149-611"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461-207">
+      <stop
+         offset="0"
+         style="stop-color:#000e90;stop-opacity:1"
+         id="stop12266" />
+      <stop
+         offset="1"
+         style="stop-color:#000967;stop-opacity:0.99795502"
+         id="stop12268" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899-19"
+       id="linearGradient4027-1-210-223-322-570"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899-19">
+      <stop
+         offset="0"
+         style="stop-color:#4b5dfe;stop-opacity:1"
+         id="stop12272" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4b5dfe;stop-opacity:0.23529412"
+         id="stop12274" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4b5dfe;stop-opacity:0.15686275"
+         id="stop12276" />
+      <stop
+         offset="1"
+         style="stop-color:#4b5dfe;stop-opacity:0.39215687"
+         id="stop12278" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461-207-402"
+       id="linearGradient4285-683-622-67-149-611-28"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461-207-402">
+      <stop
+         offset="0"
+         style="stop-color:#003a90;stop-opacity:1"
+         id="stop12756" />
+      <stop
+         offset="1"
+         style="stop-color:#002967;stop-opacity:0.99795502"
+         id="stop12758" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899-19-280"
+       id="linearGradient4027-1-210-223-322-570-921"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899-19-280">
+      <stop
+         offset="0"
+         style="stop-color:#4b93fe;stop-opacity:1"
+         id="stop12762" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#4b93fe;stop-opacity:0.23529412"
+         id="stop12764" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#4b93fe;stop-opacity:0.15686275"
+         id="stop12766" />
+      <stop
+         offset="1"
+         style="stop-color:#4b93fe;stop-opacity:0.39215687"
+         id="stop12768" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461-207-402-134"
+       id="linearGradient4285-683-622-67-149-611-28-936"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461-207-402-134">
+      <stop
+         offset="0"
+         style="stop-color:#0044a9;stop-opacity:1"
+         id="stop13266" />
+      <stop
+         offset="1"
+         style="stop-color:#003380;stop-opacity:0.99795502"
+         id="stop13268" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899-19-280-51"
+       id="linearGradient4027-1-210-223-322-570-921-60"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899-19-280-51">
+      <stop
+         offset="0"
+         style="stop-color:#64a2fe;stop-opacity:1"
+         id="stop13272" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#64a2fe;stop-opacity:0.23529412"
+         id="stop13274" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#64a2fe;stop-opacity:0.15686275"
+         id="stop13276" />
+      <stop
+         offset="1"
+         style="stop-color:#64a2fe;stop-opacity:0.39215687"
+         id="stop13278" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461-207-402-134-290"
+       id="linearGradient4285-683-622-67-149-611-28-936-389"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461-207-402-134-290">
+      <stop
+         offset="0"
+         style="stop-color:#004ec2;stop-opacity:1"
+         id="stop13796" />
+      <stop
+         offset="1"
+         style="stop-color:#003d99;stop-opacity:0.99795502"
+         id="stop13798" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899-19-280-51-372"
+       id="linearGradient4027-1-210-223-322-570-921-60-51"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899-19-280-51-372">
+      <stop
+         offset="0"
+         style="stop-color:#7db1fe;stop-opacity:1"
+         id="stop13802" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#7db1fe;stop-opacity:0.23529412"
+         id="stop13804" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#7db1fe;stop-opacity:0.15686275"
+         id="stop13806" />
+      <stop
+         offset="1"
+         style="stop-color:#7db1fe;stop-opacity:0.39215687"
+         id="stop13808" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4279-304-762-109-461-207-402-134-290-162"
+       id="linearGradient4285-683-622-67-149-611-28-936-389-459"
+       y2="662.89178"
+       x2="674.99536"
+       y1="635.92169"
+       x1="674.99536" />
+    <linearGradient
+       id="linearGradient4279-304-762-109-461-207-402-134-290-162">
+      <stop
+         offset="0"
+         style="stop-color:#0058db;stop-opacity:1"
+         id="stop14346" />
+      <stop
+         offset="1"
+         style="stop-color:#0047b2;stop-opacity:0.99795502"
+         id="stop14348" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4269-9-0-801-68-899-19-280-51-372-537"
+       id="linearGradient4027-1-210-223-322-570-921-60-51-139"
+       y2="57.674179"
+       x2="23.99999"
+       y1="-1.9506749"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient4269-9-0-801-68-899-19-280-51-372-537">
+      <stop
+         offset="0"
+         style="stop-color:#96c0fe;stop-opacity:1"
+         id="stop14352" />
+      <stop
+         offset="0.19700792"
+         style="stop-color:#96c0fe;stop-opacity:0.23529412"
+         id="stop14354" />
+      <stop
+         offset="0.6310662"
+         style="stop-color:#96c0fe;stop-opacity:0.15686275"
+         id="stop14356" />
+      <stop
+         offset="1"
+         style="stop-color:#96c0fe;stop-opacity:0.39215687"
+         id="stop14358" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-662.78571,-633.50507)">
+    <path
+       style="opacity:0.05;color:#000000;fill:#242424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3974"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       d="m 674.28125,647.84375 c -2.94458,0 -5.58673,0.68985 -7.46875,1.78125 -1.85693,1.07685 -2.90625,2.48274 -2.90625,3.96875 0,1.47223 1.05058,2.80953 2.84375,3.875 a 1.1774629,1.1774629 0 0 0 0.0937,0.0625 l -0.0312,0.0312 6.5625,5.53125 a 1.1774629,1.1774629 0 0 0 1.5,0 l 6.625,-5.375 -0.0312,-0.0312 a 1.1774629,1.1774629 0 0 0 0.0937,-0.0312 c 1.96355,-1.08113 3.09375,-2.51482 3.09375,-4.0625 0,-1.48601 -1.04932,-2.8919 -2.90625,-3.96875 -1.88202,-1.0914 -4.52417,-1.78125 -7.46875,-1.78125 z m -6.03125,7.875 c 0.008,0.007 0.0613,0.0268 0.0312,0 -0.12018,-0.10724 0.14927,0.14086 0.0312,0.0312 -0.11802,-0.10961 0.14706,0.1432 0.0312,0.0312 -0.11581,-0.11195 0.17606,0.14548 0.0625,0.0312 l -0.0625,0.0625 a 1.1774629,1.1774629 0 0 0 -0.0937,-0.15625 z m 11.875,0.0937 A 1.1774629,1.1774629 0 0 0 680,655.96875 l -0.0312,-0.0312 c -0.11976,0.10718 0.1533,-0.13581 0.0312,-0.0312 -0.12205,0.10456 0.18678,-0.1644 0.0625,-0.0625 -0.12428,0.1019 0.18896,-0.13044 0.0625,-0.0312 z" />
+    <path
+       style="opacity:0.1;color:#000000;fill:#242424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3966"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       d="m 674.28125,649.03125 c -2.75342,0 -5.2292,0.67059 -6.875,1.625 -1.6458,0.95441 -2.3125,2.0249 -2.3125,2.9375 0,0.8922 0.65933,1.92985 2.25,2.875 a 1.808614,1.808614 0 0 1 0.21875,0.1875 l 6.5625,5.53125 6.625,-5.375 A 1.808614,1.808614 0 0 1 681,656.625 c 1.74512,-0.96086 2.46875,-2.08177 2.46875,-3.03125 0,-0.9126 -0.6667,-1.98309 -2.3125,-2.9375 -1.6458,-0.95441 -4.12158,-1.625 -6.875,-1.625 z" />
+    <path
+       style="opacity:0.15;color:#000000;fill:#242424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3974-5"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       d="m 674.28125,650.21875 c -2.5594,0 -4.87521,0.65338 -6.28125,1.46875 -1.43151,0.83014 -1.71875,1.57563 -1.71875,1.90625 0,0.30349 0.30235,1.02072 1.6875,1.84375 l -0.0625,0.0937 a 1.1950764,1.1950764 0 0 1 0.4375,0.21875 l 5.78125,4.875 5.875,-4.75 a 1.1950764,1.1950764 0 0 1 0.46875,-0.21875 l -0.0312,-0.0625 c 1.52342,-0.83879 1.84375,-1.65766 1.84375,-2 0,-0.33062 -0.28724,-1.07611 -1.71875,-1.90625 -1.40604,-0.81537 -3.72185,-1.46875 -6.28125,-1.46875 z" />
+    <path
+       style="color:#000000;fill:url(#linearGradient4285-683-622-67-149-611-28-936-389-459);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3007"
+       d="m 674.28571,634.52389 c -6.07452,0 -11,4.94494 -11,11.04347 0,2.9962 1.18846,5.71492 3.11811,7.70436 l 7.69134,11.25217 7.77144,-10.95851 c 2.10521,-2.01125 3.41911,-4.85027 3.41911,-7.99802 0,-6.09853 -4.92547,-11.04347 -11,-11.04347 z" />
+    <path
+       style="color:#000000;fill:none;stroke:#004667;stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3007-6"
+       d="m 674.28571,634.52389 c -6.07452,0 -11,4.94494 -11,11.04347 0,2.9962 1.18846,5.71492 3.11811,7.70436 l 7.69134,11.25217 7.77144,-10.95851 c 2.10521,-2.01125 3.41911,-4.85027 3.41911,-7.99802 0,-6.09853 -4.92547,-11.04347 -11,-11.04347 z" />
+    <path
+       style="opacity:0.4;color:#000000;fill:none;stroke:url(#linearGradient4027-1-210-223-322-570-921-60-51-139);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4093"
+       d="m 674.28125,635.5 c -5.54209,0 -10.03125,4.49352 -10.03125,10.0625 0,2.73462 1.11745,5.21924 2.875,7.03125 a 0.98360133,0.98360133 0 0 1 0.0937,0.125 l 6.875,10.09375 L 681.0625,653 a 0.98360133,0.98360133 0 0 1 0.125,-0.15625 c 1.91706,-1.8315 3.125,-4.4045 3.125,-7.28125 0,-5.56898 -4.48914,-10.0625 -10.03125,-10.0625 z" />
+    <path
+       style="opacity:0.15;color:#000000;fill:#4bc7fe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3168-7"
+       transform="matrix(1.1239496,0,0,1.1239496,662.5,632.36221)"
+       d="m 14.934579,12.583178 a 4.4485979,4.4485979 0 1 1 -8.8971959,0 4.4485979,4.4485979 0 1 1 8.8971959,0 z" />
+    <path
+       style="color:#000000;fill:#003c5d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3168"
+       transform="matrix(1.1239496,0,0,1.1239496,662.5,631.36221)"
+       d="m 14.934579,12.583178 a 4.4485979,4.4485979 0 1 1 -8.8971959,0 4.4485979,4.4485979 0 1 1 8.8971959,0 z" />
+  </g>
+</svg>

=== added file 'icons/gps-marker.svg'
--- icons/gps-marker.svg	1970-01-01 00:00:00 +0000
+++ icons/gps-marker.svg	2014-10-18 00:49:47 +0000
@@ -0,0 +1,941 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="23"
+   height="33"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4291">
+      <stop
+         id="stop4293"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4295"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4279">
+      <stop
+         id="stop4281"
+         style="stop-color:#e74545;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4283"
+         style="stop-color:#da1c1c;stop-opacity:0.99795502"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4269">
+      <stop
+         id="stop4271"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4273"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.19700792" />
+      <stop
+         id="stop4275"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.6310662" />
+      <stop
+         id="stop4277"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient3683"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51455032,0,0,0.51453856,-24.005236,9.8064595)" />
+    <linearGradient
+       id="linearGradient3603">
+      <stop
+         id="stop3605"
+         style="stop-color:#a7651c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3607"
+         style="stop-color:#c8a700;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.379412"
+       y1="44.980297"
+       x2="18.379412"
+       y2="3.0816143"
+       id="linearGradient3730"
+       xlink:href="#linearGradient3603"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2703533,0,0,0.27035337,1.5115215,1.5115197)" />
+    <linearGradient
+       id="linearGradient3690">
+      <stop
+         id="stop3692"
+         style="stop-color:#ffeb9f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3694"
+         style="stop-color:#ffd57e;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3696"
+         style="stop-color:#ffbc43;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3698"
+         style="stop-color:#ff921a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="23.895569"
+       cy="3.9900031"
+       r="20.397499"
+       fx="23.895569"
+       fy="3.9900031"
+       id="radialGradient3728"
+       xlink:href="#linearGradient3690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.64524082,-0.85170617,0,11.39831,-13.333564)" />
+    <radialGradient
+       cx="7.1183534"
+       cy="9.9571075"
+       r="12.671875"
+       fx="7.1183534"
+       fy="9.9571075"
+       id="radialGradient4065"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,117.18262,-143.86282,0,1693.1125,-1069.0711)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7">
+      <stop
+         id="stop3750-1-0-7-6-6-1-3-9-3-7"
+         style="stop-color:#505050;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-7-4-0-32-8-923-0-7-3"
+         style="stop-color:#2b2b2b;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-1-8-5-2-7-6-7-1-9-6"
+         style="stop-color:#0a0a0a;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3756-1-6-2-6-6-1-96-6-0-1"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="7.1183534"
+       cy="9.9571075"
+       r="12.671875"
+       fx="7.1183534"
+       fy="9.9571075"
+       id="radialGradient3249-0"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,117.18262,-143.86282,0,1693.1125,-1069.0711)" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         id="stop3897"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3899"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05263157" />
+      <stop
+         id="stop3901"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3903"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="26.000008"
+       x2="20"
+       y2="13.000008"
+       id="linearGradient4183"
+       xlink:href="#linearGradient3680-6-6-6-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.9999922)" />
+    <linearGradient
+       id="linearGradient3680-6-6-6-3">
+      <stop
+         id="stop3682-4-6-1-3"
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3684-8-5-8-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient3982"
+       xlink:href="#linearGradient3924-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4e-6,1.0000062)" />
+    <linearGradient
+       id="linearGradient3924-1">
+      <stop
+         id="stop3926-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3928-91"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3930-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-6"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3963"
+       xlink:href="#linearGradient3688-166-749-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749-4">
+      <stop
+         id="stop2883-3"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885-2"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3965"
+       xlink:href="#linearGradient3688-464-309-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309-3">
+      <stop
+         id="stop2889-6"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891-2"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient3967"
+       xlink:href="#linearGradient3702-501-757-2"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3702-501-757-2">
+      <stop
+         id="stop2895-3"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897-0"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899-1"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="26.000008"
+       x2="20"
+       y2="13.000008"
+       id="linearGradient3018"
+       xlink:href="#linearGradient3680-6-6-6-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.9999922)" />
+    <radialGradient
+       cx="6.7304144"
+       cy="9.9571075"
+       r="12.671875"
+       fx="6.2001843"
+       fy="9.9571075"
+       id="radialGradient3031"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,9.4975523,-11.65996,0,140.93055,-79.160978)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8">
+      <stop
+         id="stop3750-1-0-7-6-6-1-3-9"
+         style="stop-color:#ffcd7d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-7-4-0-32-8-923-0"
+         style="stop-color:#fc8f36;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-1-8-5-2-7-6-7-1"
+         style="stop-color:#e23a0e;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3756-1-6-2-6-6-1-96-6"
+         style="stop-color:#ac441f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
+      <stop
+         id="stop3750-1-0-7-6-6-1-3-9-3"
+         style="stop-color:#505050;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-7-4-0-32-8-923-0-7"
+         style="stop-color:#2b2b2b;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-1-8-5-2-7-6-7-1-9"
+         style="stop-color:#0a0a0a;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3756-1-6-2-6-6-1-96-6-0"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="6.7304144"
+       cy="9.9571075"
+       r="12.671875"
+       fx="6.2001843"
+       fy="9.9571075"
+       id="radialGradient3077"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,9.4975523,-11.65996,0,136.43054,-84.660973)" />
+    <linearGradient
+       id="linearGradient3680-6-6-6-3-7">
+      <stop
+         id="stop3682-4-6-1-3-7"
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3684-8-5-8-0-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="26.000008"
+       x2="20"
+       y2="13.000008"
+       id="linearGradient3950"
+       xlink:href="#linearGradient3680-6-6-6-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-20,-24.000008)" />
+    <radialGradient
+       cx="8.276144"
+       cy="9.9941158"
+       r="12.671875"
+       fx="8.276144"
+       fy="9.9941158"
+       id="radialGradient3104"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,85.484079,-104.94714,0,1299.7805,-832.8559)" />
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient4181"
+       xlink:href="#linearGradient3924-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(5.3e-6,1.0000015)" />
+    <linearGradient
+       id="linearGradient3924-3">
+      <stop
+         id="stop3926-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3928-3"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3930-7"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="167.98311"
+       y1="8.50811"
+       x2="167.98311"
+       y2="54.780239"
+       id="linearGradient4907-4"
+       xlink:href="#linearGradient5803-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7037037,0,0,0.7037037,-39.333369,2.4814295)" />
+    <linearGradient
+       id="linearGradient5803-2-7">
+      <stop
+         id="stop5805-3-6"
+         style="stop-color:#fffdf3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5807-0-0"
+         style="stop-color:#fbebeb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="8.276144"
+       cy="9.9941158"
+       r="12.671875"
+       fx="8.276144"
+       fy="9.9941158"
+       id="radialGradient6305"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,6.6677582,-8.1858766,0,105.8829,-59.462774)" />
+    <linearGradient
+       id="linearGradient3242">
+      <stop
+         id="stop3244"
+         style="stop-color:#f89b7e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3246"
+         style="stop-color:#e35d4f;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3248"
+         style="stop-color:#c6262e;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3250"
+         style="stop-color:#690b2c;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3013"
+       xlink:href="#linearGradient3688-166-749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749">
+      <stop
+         id="stop2883"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3015"
+       xlink:href="#linearGradient3688-464-309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309">
+      <stop
+         id="stop2889"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-501-757">
+      <stop
+         id="stop2895"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient3141"
+       xlink:href="#linearGradient3702-501-757"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       id="linearGradient3288"
+       xlink:href="#linearGradient152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,158.172)"
+       spreadMethod="pad" />
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       id="linearGradient152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,158.172)"
+       spreadMethod="pad">
+      <stop
+         id="stop154"
+         style="stop-color:#f8a52c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop156"
+         style="stop-color:#e82e23;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <clipPath
+       id="clipPath148">
+      <path
+         d="m 73.0625,1288.75 0,-1064.57 3694.7075,0 0,1075.02 c 0,0 -615.78,365.29 -1742.98,365.29 -1127.2,0 -1951.7275,-375.74 -1951.7275,-375.74"
+         id="path150" />
+    </clipPath>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       id="linearGradient22"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.04345,-131.509,-131.509,1.04345,192.696,508.172)"
+       spreadMethod="pad">
+      <stop
+         id="stop24"
+         style="stop-color:#f8a52c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop26"
+         style="stop-color:#e82e23;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <clipPath
+       id="clipPath18">
+      <path
+         d="m 73.0625,4788.75 0,-1064.57 3694.7075,0 0,1075.02 c 0,0 -615.78,365.29 -1742.98,365.29 -1127.2,0 -1951.7275,-375.74 -1951.7275,-375.74"
+         id="path20" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient3702-501-757-5">
+      <stop
+         id="stop2895-5"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897-1"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899-4"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient3086"
+       xlink:href="#linearGradient3702-501-757-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688-464-309-87">
+      <stop
+         id="stop2889-5"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891-5"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3084"
+       xlink:href="#linearGradient3688-464-309-87"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749-1">
+      <stop
+         id="stop2883-79"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885-4"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient3082"
+       xlink:href="#linearGradient3688-166-749-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3242-6">
+      <stop
+         id="stop3244-9"
+         style="stop-color:#f89b7e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3246-9"
+         style="stop-color:#e35d4f;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3248-9"
+         style="stop-color:#c6262e;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3250-9"
+         style="stop-color:#690b2c;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="8.276144"
+       cy="9.9941158"
+       r="12.671875"
+       fx="8.276144"
+       fy="9.9941158"
+       id="radialGradient4680-7"
+       xlink:href="#linearGradient3242-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,3.248395,-3.9879912,0,51.891669,-37.148511)" />
+    <linearGradient
+       id="linearGradient5803-2-7-5">
+      <stop
+         id="stop5805-3-6-4"
+         style="stop-color:#fffdf3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5807-0-0-9"
+         style="stop-color:#fbebeb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="167.98311"
+       y1="8.50811"
+       x2="167.98311"
+       y2="54.780239"
+       id="linearGradient5041-7"
+       xlink:href="#linearGradient5803-2-7-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33333333,0,0,0.33333333,-18.000021,-6.6666402)" />
+    <linearGradient
+       id="linearGradient3924-1-2">
+      <stop
+         id="stop3926-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3928-32"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3930-1"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-3"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient4160"
+       xlink:href="#linearGradient3924-1-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.9729689,-7.0270212)" />
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient4160-4"
+       xlink:href="#linearGradient3924-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.9729689,-7.0270212)" />
+    <linearGradient
+       id="linearGradient3924-1-2-6">
+      <stop
+         id="stop3926-5-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3928-32-3"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3930-1-7"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-3-0"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="-1.9506749"
+       x2="23.99999"
+       y2="57.674179"
+       id="linearGradient4207-1"
+       xlink:href="#linearGradient4269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)" />
+    <linearGradient
+       id="linearGradient3924-1-2-6-0">
+      <stop
+         id="stop3926-5-5-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3928-32-3-6"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3930-1-7-2"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3932-3-0-9"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient4247"
+       xlink:href="#linearGradient3924-1-2-6-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,-2.0270504,-2.0270449)" />
+    <linearGradient
+       x1="674.99536"
+       y1="635.92169"
+       x2="674.99536"
+       y2="662.89178"
+       id="linearGradient4285"
+       xlink:href="#linearGradient4279"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="11.325233"
+       cy="30.998131"
+       r="7.0953269"
+       fx="11.325233"
+       fy="30.998131"
+       id="radialGradient4297"
+       xlink:href="#linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.25,0,23.248598)" />
+    <filter
+       x="-0.15516667"
+       y="-0.097828373"
+       width="1.3103333"
+       height="1.1956567"
+       color-interpolation-filters="sRGB"
+       id="filter4345">
+      <feGaussianBlur
+         id="feGaussianBlur4347"
+         stdDeviation="0.4655" />
+    </filter>
+    <linearGradient
+       x1="674.99536"
+       y1="635.92169"
+       x2="674.99536"
+       y2="662.89178"
+       id="linearGradient4285-7"
+       xlink:href="#linearGradient4279-2"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4279-2">
+      <stop
+         id="stop4281-4"
+         style="stop-color:#e74545;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4283-7"
+         style="stop-color:#da1c1c;stop-opacity:0.99795502"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="-1.9506749"
+       x2="23.99999"
+       y2="57.674179"
+       id="linearGradient4207-1-1"
+       xlink:href="#linearGradient4269-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)" />
+    <linearGradient
+       id="linearGradient4269-9">
+      <stop
+         id="stop4271-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4273-3"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.19700792" />
+      <stop
+         id="stop4275-1"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.6310662" />
+      <stop
+         id="stop4277-8"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="-1.9506749"
+       x2="23.99999"
+       y2="57.674179"
+       id="linearGradient4027"
+       xlink:href="#linearGradient4269-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,664.4146,636.19848)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-662.78571,-633.50507)"
+     id="layer1">
+    <path
+       d="m 674.28125,647.84375 c -2.94458,0 -5.58673,0.68985 -7.46875,1.78125 -1.85693,1.07685 -2.90625,2.48274 -2.90625,3.96875 0,1.47223 1.05058,2.80953 2.84375,3.875 a 1.1774629,1.1774629 0 0 0 0.0937,0.0625 l -0.0312,0.0312 6.5625,5.53125 a 1.1774629,1.1774629 0 0 0 1.5,0 l 6.625,-5.375 -0.0312,-0.0312 a 1.1774629,1.1774629 0 0 0 0.0937,-0.0312 c 1.96355,-1.08113 3.09375,-2.51482 3.09375,-4.0625 0,-1.48601 -1.04932,-2.8919 -2.90625,-3.96875 -1.88202,-1.0914 -4.52417,-1.78125 -7.46875,-1.78125 z m -6.03125,7.875 c 0.008,0.007 0.0613,0.0268 0.0312,0 -0.12018,-0.10724 0.14927,0.14086 0.0312,0.0312 -0.11802,-0.10961 0.14706,0.1432 0.0312,0.0312 -0.11581,-0.11195 0.17606,0.14548 0.0625,0.0312 l -0.0625,0.0625 a 1.1774629,1.1774629 0 0 0 -0.0937,-0.15625 z m 11.875,0.0937 A 1.1774629,1.1774629 0 0 0 680,655.96875 l -0.0312,-0.0312 c -0.11976,0.10718 0.1533,-0.13581 0.0312,-0.0312 -0.12205,0.10456 0.18678,-0.1644 0.0625,-0.0625 -0.12428,0.1019 0.18896,-0.13044 0.0625,-0.0312 z"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       id="path3974"
+       style="opacity:0.05;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 674.28125,649.03125 c -2.75342,0 -5.2292,0.67059 -6.875,1.625 -1.6458,0.95441 -2.3125,2.0249 -2.3125,2.9375 0,0.8922 0.65933,1.92985 2.25,2.875 a 1.808614,1.808614 0 0 1 0.21875,0.1875 l 6.5625,5.53125 6.625,-5.375 A 1.808614,1.808614 0 0 1 681,656.625 c 1.74512,-0.96086 2.46875,-2.08177 2.46875,-3.03125 0,-0.9126 -0.6667,-1.98309 -2.3125,-2.9375 -1.6458,-0.95441 -4.12158,-1.625 -6.875,-1.625 z"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       id="path3966"
+       style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 674.28125,650.21875 c -2.5594,0 -4.87521,0.65338 -6.28125,1.46875 -1.43151,0.83014 -1.71875,1.57563 -1.71875,1.90625 0,0.30349 0.30235,1.02072 1.6875,1.84375 l -0.0625,0.0937 a 1.1950764,1.1950764 0 0 1 0.4375,0.21875 l 5.78125,4.875 5.875,-4.75 a 1.1950764,1.1950764 0 0 1 0.46875,-0.21875 l -0.0312,-0.0625 c 1.52342,-0.83879 1.84375,-1.65766 1.84375,-2 0,-0.33062 -0.28724,-1.07611 -1.71875,-1.90625 -1.40604,-0.81537 -3.72185,-1.46875 -6.28125,-1.46875 z"
+       transform="matrix(1,0,0,0.8490188,0,102.82045)"
+       id="path3974-5"
+       style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 674.28571,634.52389 c -6.07452,0 -11,4.94494 -11,11.04347 0,2.9962 1.18846,5.71492 3.11811,7.70436 l 7.69134,11.25217 7.77144,-10.95851 c 2.10521,-2.01125 3.41911,-4.85027 3.41911,-7.99802 0,-6.09853 -4.92547,-11.04347 -11,-11.04347 z"
+       id="path3007"
+       style="color:#000000;fill:url(#linearGradient4285);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 674.28571,634.52389 c -6.07452,0 -11,4.94494 -11,11.04347 0,2.9962 1.18846,5.71492 3.11811,7.70436 l 7.69134,11.25217 7.77144,-10.95851 c 2.10521,-2.01125 3.41911,-4.85027 3.41911,-7.99802 0,-6.09853 -4.92547,-11.04347 -11,-11.04347 z"
+       id="path3007-6"
+       style="color:#000000;fill:none;stroke:#da1c1c;stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 674.28125,635.5 c -5.54209,0 -10.03125,4.49352 -10.03125,10.0625 0,2.73462 1.11745,5.21924 2.875,7.03125 a 0.98360133,0.98360133 0 0 1 0.0937,0.125 l 6.875,10.09375 L 681.0625,653 a 0.98360133,0.98360133 0 0 1 0.125,-0.15625 c 1.91706,-1.8315 3.125,-4.4045 3.125,-7.28125 0,-5.56898 -4.48914,-10.0625 -10.03125,-10.0625 z"
+       id="path4093"
+       style="opacity:0.4;color:#000000;fill:none;stroke:url(#linearGradient4027);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 14.934579,12.583178 a 4.4485979,4.4485979 0 1 1 -8.8971959,0 4.4485979,4.4485979 0 1 1 8.8971959,0 z"
+       transform="matrix(1.1239496,0,0,1.1239496,662.5,632.36221)"
+       id="path3168-7"
+       style="opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 14.934579,12.583178 a 4.4485979,4.4485979 0 1 1 -8.8971959,0 4.4485979,4.4485979 0 1 1 8.8971959,0 z"
+       transform="matrix(1.1239496,0,0,1.1239496,662.5,631.36221)"
+       id="path3168"
+       style="color:#000000;fill:#8b1212;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>

=== added file 'icons/import-all.png'
Binary files icons/import-all.png	1970-01-01 00:00:00 +0000 and icons/import-all.png	2014-10-18 00:49:47 +0000 differ
=== added file 'icons/import.svg'
--- icons/import.svg	1970-01-01 00:00:00 +0000
+++ icons/import.svg	2014-10-18 00:49:47 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
+	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" viewBox="0 0 128 128" overflow="visible" enable-background="new 0 0 128 128" xml:space="preserve">
+	<path opacity="0.2" fill="#1A1A1A" d="M125,106c0,6.286-2.713,9-9,9H14c-6.286,0-9-2.714-9-9V24c0-6.287,2.714-9,9-9h102   c6.287,0,9,2.713,9,9V106z"/>
+	<path opacity="0.2" fill="#1A1A1A" d="M124.25,107c0,6.286-2.68,9-8.888,9H14.638c-6.208,0-8.888-2.714-8.888-9V25   c0-6.287,2.68-9,8.888-9h100.725c6.208,0,8.888,2.713,8.888,9V107z"/>
+	<path opacity="0.4" fill="#1A1A1A" d="M14,12C7.178,12,4,15.178,4,22v82c0,6.822,3.178,10,10,10h102c6.822,0,10-3.178,10-10V22   c0-6.822-3.178-10-10-10H14z"/>
+	<linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="23.3413" y1="24" x2="119.5405" y2="114.0588">
+		<stop offset="0" style="stop-color: rgb(248, 249, 248);"/>
+		<stop offset="1" style="stop-color: rgb(231, 231, 230);"/>
+	</linearGradient>
+	<path fill="url(#XMLID_7_)" d="M125,104c0,6.286-2.713,9-9,9H14c-6.286,0-9-2.714-9-9V22c0-6.287,2.714-9,9-9h102   c6.287,0,9,2.713,9,9V104z"/>
+	<rect x="16" y="36" fill="#003A8F" width="98" height="52"/>
+	<rect x="17" y="37" fill="#FFFFFF" width="98" height="52"/>
+	<radialGradient id="XMLID_8_" cx="44" cy="46" r="94.8685" gradientUnits="userSpaceOnUse">
+		<stop offset="0" style="stop-color: rgb(83, 142, 212);"/>
+		<stop offset="1" style="stop-color: rgb(0, 25, 64);"/>
+	</radialGradient>
+	<rect x="16" y="50" fill="url(#XMLID_8_)" width="98" height="38"/>
+	<rect x="16" y="36" fill="#296096" width="98" height="14"/>
+	<path fill="#52463A" d="M67,87.951c-2.975-3.135-5.95-6.269-11.899-6.269c-5.949,0-20.823-6.271-20.823-6.271   s-11.899-6.27-17.849-6.27c0,6.27,0,18.809,0,18.809H67z"/>
+	<linearGradient id="XMLID_9_" gradientUnits="userSpaceOnUse" x1="70.2695" y1="26.522" x2="57.2696" y2="73.522">
+		<stop offset="0" style="stop-color: rgb(101, 162, 220);"/>
+		<stop offset="0.5674" style="stop-color: rgb(78, 131, 194);"/>
+		<stop offset="1" style="stop-color: rgb(136, 174, 194);"/>
+	</linearGradient>
+	<path fill="url(#XMLID_9_)" d="M113,54.143c-30,0-84,11.429-96,22.857V37h96V54.143z"/>
+	<linearGradient id="XMLID_10_" gradientUnits="userSpaceOnUse" x1="18.6816" y1="75.5381" x2="49.1252" y2="91.7747">
+		<stop offset="0" style="stop-color: rgb(124, 130, 113);"/>
+		<stop offset="1" style="stop-color: rgb(120, 103, 85);"/>
+	</linearGradient>
+	<path fill="url(#XMLID_10_)" d="M65.5,88c-2.912-2.833-5.823-5.666-11.647-5.666c-5.823,0-20.382-5.667-20.382-5.667   S21.823,71,16,71c0,5.667,0,17,0,17H65.5z"/>
+	<path fill="#CBC7B8" d="M17,77c1.74-1.657,4.369-3.314,7.675-4.938c-2.697-0.968-5.513-1.774-7.675-1.902V77z"/>
+	<path fill="#52463A" d="M83.939,87.955c0,0,2.728-4.596,6.291-4.596c3.564,0,4.401,4.596,4.401,4.596H83.939z"/>
+	
+		<linearGradient id="XMLID_11_" gradientUnits="userSpaceOnUse" x1="85.4639" y1="86.5039" x2="94.0352" y2="86.5039" gradientTransform="matrix(1, 0, -0.1353, 0.9324, 11.5082, 5.4565)">
+		<stop offset="0" style="stop-color: rgb(124, 130, 113);"/>
+		<stop offset="1" style="stop-color: rgb(120, 103, 85);"/>
+	</linearGradient>
+	<path fill="url(#XMLID_11_)" d="M85,87.955c0,0,2.187-3.685,5.043-3.685c2.857,0,3.528,3.685,3.528,3.685H85z"/>
+	<linearGradient id="XMLID_12_" gradientUnits="userSpaceOnUse" x1="41" y1="47.7856" x2="101.25" y2="47.7856">
+		<stop offset="0" style="stop-color: rgb(96, 133, 185);"/>
+		<stop offset="1" style="stop-color: rgb(55, 73, 122);"/>
+	</linearGradient>
+	<path fill="url(#XMLID_12_)" d="M45.288,50.143h67.215c-1.565-2.777-4.952-4.714-8.909-4.714H54.199   C50.241,45.429,46.853,47.366,45.288,50.143z"/>
+	<path fill="#BCAC8D" d="M27.793,76.766c-1.633-2.153-4.843-3.357-5.856-0.658c-1.012,2.697-2.025,5.396-2.025,5.396l6.983,4.161   L27.793,76.766z"/>
+	<path fill="#56573F" d="M30.825,76.912C30.327,79.664,27,87,27,87h-8c0,0,8.157-11.922,9.991-11.005   C30.825,76.912,30.825,76.912,30.825,76.912z"/>
+	<path fill="#3A434C" d="M30,86c0,0,5.228-2.161,6.918-3.625s2.457-3.311,2.457-3.311l-4.461,0.313L30,86z"/>
+	<path fill="#BCAC8D" d="M37,81c-2-1-5-1-5,1s0,4,0,4l7,1L37,81z"/>
+	<path fill="#BCAC8D" d="M46,82.493c-2-0.751-5-0.751-5,0.751c0,1.503,0,3.005,0,3.005L48,87L46,82.493z"/>
+	<path fill="#94876F" d="M53.794,83.459c-1.85-0.699-3.949-0.699-3.047,0.699c0.901,1.399,1.803,2.799,1.803,2.799l5.348,0.699   L53.794,83.459z"/>
+	<path fill="#53634C" d="M51,86c0,0-4-4-6-5s-4-1-4-1l2,4L51,86z"/>
+</svg>
\ No newline at end of file

=== added file 'icons/places.svg'
--- icons/places.svg	1970-01-01 00:00:00 +0000
+++ icons/places.svg	2014-10-18 00:49:47 +0000
@@ -0,0 +1,679 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg4215"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="places.svg"
+   inkscape:export-filename="/home/sam/places.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4217">
+    <linearGradient
+       id="linearGradient19627">
+      <stop
+         style="stop-color:#585858;stop-opacity:1;"
+         offset="0"
+         id="stop19629" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:1;"
+         offset="1"
+         id="stop19631" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient15009-5-8">
+      <stop
+         style="stop-color:#383e34;stop-opacity:1"
+         offset="0"
+         id="stop15011-5-3" />
+      <stop
+         style="stop-color:#84917c;stop-opacity:1"
+         offset="1"
+         id="stop15013-7-58" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15009-2">
+      <stop
+         style="stop-color:#303030;stop-opacity:1;"
+         offset="0"
+         id="stop15011-8" />
+      <stop
+         style="stop-color:#959595;stop-opacity:1;"
+         offset="1"
+         id="stop15013-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient60943">
+      <stop
+         id="stop60945"
+         offset="0"
+         style="stop-color:#95c48c;stop-opacity:1;" />
+      <stop
+         id="stop60947"
+         offset="1"
+         style="stop-color:#a6dc98;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient60637">
+      <stop
+         id="stop60639"
+         offset="0"
+         style="stop-color:#4c84d8;stop-opacity:1;" />
+      <stop
+         id="stop60641"
+         offset="1"
+         style="stop-color:#6b9bdc;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14755-8"
+       id="radialGradient60893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.57798165,0,82.135321)"
+       cx="149.375"
+       cy="194.625"
+       fx="149.375"
+       fy="194.625"
+       r="13.625" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14755-8">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop14757-1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop14759-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14991-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop14993-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop14995-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20627-8-0"
+       id="linearGradient60901"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,53.736825)"
+       x1="49.75"
+       y1="218.75"
+       x2="98.59375"
+       y2="217" />
+    <linearGradient
+       id="linearGradient20627-8-0">
+      <stop
+         style="stop-color:#f8d022;stop-opacity:1;"
+         offset="0"
+         id="stop22486-6-5" />
+      <stop
+         id="stop20631-9-6"
+         offset="1"
+         style="stop-color:#e3ce74;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20104-9-1-6"
+       id="linearGradient60903"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,53.736825)"
+       x1="126.7462"
+       y1="210.79668"
+       x2="149.73004"
+       y2="150.20921" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20104-9-1-6">
+      <stop
+         style="stop-color:#826a00;stop-opacity:1;"
+         offset="0"
+         id="stop20106-9-6-9" />
+      <stop
+         style="stop-color:#d9b100;stop-opacity:1"
+         offset="1"
+         id="stop20108-6-6-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20114-7-2-5-2-9"
+       id="linearGradient60905"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,68.736825)"
+       x1="113.81474"
+       y1="157.29919"
+       x2="175.08"
+       y2="155.54919" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20114-7-2-5-2-9">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop20116-5-2-3-4-0" />
+      <stop
+         style="stop-color:#a4a5a1;stop-opacity:1"
+         offset="1"
+         id="stop20118-4-5-6-9-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22395-8-5"
+       id="linearGradient60907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,53.736825)"
+       x1="98.5"
+       y1="173.5"
+       x2="112.75"
+       y2="169.25" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient22395-8-5">
+      <stop
+         style="stop-color:#bdbdbd;stop-opacity:1;"
+         offset="0"
+         id="stop22397-0-6" />
+      <stop
+         style="stop-color:#cdcdcd;stop-opacity:1"
+         offset="1"
+         id="stop22399-6-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20114-7-6-1"
+       id="linearGradient60911"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,68.736825)"
+       x1="130.81474"
+       y1="175.54919"
+       x2="182.08"
+       y2="175.54919" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20114-7-6-1">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop20116-5-4-8" />
+      <stop
+         style="stop-color:#a4a5a1;stop-opacity:1"
+         offset="1"
+         id="stop20118-4-2-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20114-7-4-6-4-1"
+       id="linearGradient60913"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,53.736825)"
+       x1="130.81474"
+       y1="175.54919"
+       x2="182.08"
+       y2="175.54919" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20114-7-4-6-4-1">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop20116-5-9-2-3-4" />
+      <stop
+         style="stop-color:#a4a5a1;stop-opacity:1"
+         offset="1"
+         id="stop20118-4-3-9-0-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22799-6-7"
+       id="linearGradient60919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(507.9375,53.736825)"
+       x1="118"
+       y1="159.375"
+       x2="103.25"
+       y2="169.875" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient22799-6-7">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop22801-7-5" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.37280703"
+         offset="1"
+         id="stop22803-5-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14670-0">
+      <stop
+         style="stop-color:#fc6c6c;stop-opacity:1;"
+         offset="0"
+         id="stop14672-2" />
+      <stop
+         style="stop-color:#f92424;stop-opacity:1;"
+         offset="1"
+         id="stop14674-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14971-4">
+      <stop
+         style="stop-color:#fabebe;stop-opacity:1;"
+         offset="0"
+         id="stop14973-7" />
+      <stop
+         style="stop-color:#fabebe;stop-opacity:0;"
+         offset="1"
+         id="stop14975-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14745-0">
+      <stop
+         style="stop-color:#ff4141;stop-opacity:1"
+         offset="0"
+         id="stop14747-5" />
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="1"
+         id="stop14749-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14683-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop14685-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop14687-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36566">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop36568" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop36570" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14991-1"
+       id="radialGradient4479"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.11297688,-0.0292602,0.01813654,0.07002722,-6.7577806,-3.8534916)"
+       cx="80.25"
+       cy="187.73877"
+       fx="80.25"
+       fy="187.73877"
+       r="30.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient60637"
+       id="linearGradient4484"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09997235,0,0,0.09997235,-1.3369622,-10.014789)"
+       x1="105.5"
+       y1="189"
+       x2="156.5"
+       y2="195.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient60943"
+       id="linearGradient4487"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09997235,0,0,0.09997235,-2.309234,-12.224498)"
+       x1="58.907967"
+       y1="194.96349"
+       x2="92.707535"
+       y2="191.56073" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15009-2"
+       id="radialGradient4490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17477181,-0.00863071,0.00354741,0.07183502,-9.6863349,-4.8589985)"
+       cx="88.25"
+       cy="218.765"
+       fx="88.25"
+       fy="218.765"
+       r="34.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15009-5-8"
+       id="radialGradient4493"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17477181,-0.00863071,0.00354741,0.07183502,-9.6863349,-4.8589985)"
+       cx="81.881546"
+       cy="250.70465"
+       fx="81.881546"
+       fy="250.70465"
+       r="34.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19627"
+       id="linearGradient4497"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10118493,0,0,0.10118493,-2.4711313,-12.467927)"
+       x1="171.2774"
+       y1="272.52652"
+       x2="171.2774"
+       y2="173.69757" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14755-8"
+       id="radialGradient4499"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.57798165,0,82.135321)"
+       cx="149.375"
+       cy="194.625"
+       fx="149.375"
+       fy="194.625"
+       r="13.625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14971-4"
+       id="radialGradient4503"
+       gradientUnits="userSpaceOnUse"
+       cx="129.25"
+       cy="129.83951"
+       fx="129.25"
+       fy="129.83951"
+       r="34.93745" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14745-0"
+       id="radialGradient4505"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7826226,0,0,1.7826226,-100.09062,-90.782804)"
+       cx="127.8913"
+       cy="115.99819"
+       fx="127.8913"
+       fy="115.99819"
+       r="31.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14683-3"
+       id="radialGradient4507"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08293973,0,0,0.0351222,-1.3902711,-0.23397073)"
+       cx="149.48978"
+       cy="49.24028"
+       fx="149.48978"
+       fy="49.24028"
+       r="34.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36566"
+       id="radialGradient4509"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5960718,-1.7955579,1.4342795,3.5765632,-485.76309,114.25751)"
+       cx="151.68309"
+       cy="60.712517"
+       fx="151.68309"
+       fy="60.712517"
+       r="43.284622" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14670-0"
+       id="radialGradient4516"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1113328,0,0,0.17423427,-3.3897623,-14.009352)"
+       cx="125.57332"
+       cy="122.20717"
+       fx="125.57332"
+       fy="122.20717"
+       r="31.25" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="17.448447"
+     inkscape:cy="9.549479"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1364"
+     inkscape:window-height="700"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4458"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid5312"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingy="0.5px"
+       spacingx="0.5px"
+       dotted="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4220">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path60799"
+       d="M 2.6784843,1.6904231 2.5990879,7.3149065 0.90682506,13.197299 c 0.23677974,1.463057 0.10600184,1.956622 1.49304804,2.116338 l 4.8149959,-0.0681 0.052888,-1.590934 5.042538,1.724029 2.956655,-0.02136 -0.05262,-3.220914 c 0,0 -0.161929,-8.692036 -0.146434,-10.4391451 z"
+       style="color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49300000000000010;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;" />
+    <path
+       style="color:#000000;fill:url(#radialGradient4490);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;"
+       d="M 1.0898291,13.068507 C 1,14.5 1.9472106,15.098665 1.9472106,15.098665 L 7.5,15.5 6.5,13 8.5,10.5 3,10 z"
+       id="path60811"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       style="color:#000000;fill:url(#linearGradient4487);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;"
+       d="M 8.9919354,1.9293118 3.02748,1.883316 3,7 0.83989467,13.218467 7.2257479,12.794449 14.750284,2.1580405 z"
+       id="path60813"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path60815"
+       d="M 9.9099312,4.231271 13.358977,5.8808145 13.908823,9.4298334 14.308711,14.82834 8.011809,11.926129 C 7.8368592,11.838653 7.7605241,11.879154 7.7605241,11.879154 L 9.4100677,7.9302457 z"
+       style="color:#000000;fill:url(#linearGradient4484);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="opacity:0.40329218999999999;color:#000000;fill:url(#radialGradient4479);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;"
+       d="M 3.7898193,7.3642785 8.4377959,5.7705255 7.2381279,8.5197649 2.3623942,10.199414 z"
+       id="path60825"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g60829"
+       style="display:inline;enable-background:new;"
+       transform="matrix(0.09719553,0,0,0.09719553,-51.08588,-17.20868)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         style="color:#000000;fill:url(#linearGradient60901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 612.9375,238.38368 -16.84898,8.1404 0.85052,-6.76255 2.13898,-34.41117 -14.83686,-1.62746 0.55229,40.71824 -2.79113,7.67308 -24.40607,12.92821 -12.86502,30.42443 63.20627,-42.73004 z"
+         id="path60833"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient60903);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 660.4375,262.04243 0.76517,18.28279 c -7.89969,-5.94207 -15.72727,-12.15628 -24.09494,-15.7584 l -2.97112,20.59528 -11.15249,-4.86108 3.41276,-21.30895 c -6.14682,-3.03548 -11.4057,-4.51144 -17.95938,-6.25525 l 5.9754,-14.59725 c 17.25655,5.18877 30.3536,13.661 46.0246,23.90286 z"
+         id="path60835"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="color:#000000;fill:url(#linearGradient60905);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 635.02589,248.76455 1.41161,-11.02773 1,-30.5 -16.75,-8.5 -4.75,34.5 -2,6 c 7.12881,2.34073 13.73494,5.14295 21.08839,9.52773 z"
+         id="path60837"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path60839"
+         d="m 596.4375,247.23682 4.75,-8.75 2,-31.75 16.52145,-3.10726 -3.77145,29.60726 -2,6 z"
+         style="color:#000000;fill:url(#linearGradient60907);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="color:#000000;fill:url(#linearGradient60911);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 660.05385,263.37792 c -7.39932,-4.02395 -13.48444,-10.84143 -21.3016,-13.61182 l 0,-10.42982 20.68288,9.63433 z"
+         id="path60843"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;fill:#686965;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 658.55124,233.17511 2.12132,13.08148 -22.62741,-10.25305 0.35355,-12.37437 z"
+         id="path60845"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient60913);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 651.48018,278.42995 0.7071,12.02081 11.31372,5.83364 -1.85616,-11.93242 z"
+         id="path60847"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="opacity:0.30452677;color:#000000;fill:url(#linearGradient60919);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 603.4375,206.73682 17,-3.59654 19,4.09654 -4.25,32.75 -19.25,-8.5 -15,7 z"
+         id="path60853"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path60859"
+       d="M 7,14.5 C 5.0964437,14.373323 2.9802468,15.200332 1.4524853,13.944797"
+       style="opacity:0.31275719000000002;color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:square;"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:url(#linearGradient4497);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.5,1.5 0,5.5 -2,6 c 0,2 0.6129538,2.340284 2,2.5 l 5,0 L 7.267757,13.654603 12.5,15.5 l 3,0 L 15,12 c 0,0 0.484505,-8.7528909 0.5,-10.5 z"
+       id="path5310"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.34979428000000001;color:#000000;fill:url(#radialGradient4499);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;"
+       id="path60863"
+       sodipodi:cx="149.375"
+       sodipodi:cy="194.625"
+       sodipodi:rx="13.625"
+       sodipodi:ry="7.875"
+       d="m 163,194.625 a 13.625,7.875 0 1 1 -27.25,0 13.625,7.875 0 1 1 27.25,0 z"
+       transform="matrix(0.07540457,0,0,0.07412479,-0.25579866,-3.2535059)" />
+    <rect
+       style="opacity:0.4;fill:#ffffff;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       id="rect5314"
+       width="12"
+       height="1"
+       x="3"
+       y="2" />
+    <path
+       style="color:#000000;fill:url(#radialGradient4516);fill-opacity:1;fill-rule:nonzero;stroke:#c90505;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:1"
+       d="m 14.47915,4.0242092 c 0,2.7650457 -2.734173,7.5110528 -3.479148,7.4544378 -0.744978,-0.05662 -3.4791507,-4.6327757 -3.4791507,-7.4544378 0,-1.896934 1.5576701,-3.43470254 3.4791507,-3.43470254 1.921482,0 3.479148,1.53776854 3.479148,3.43470254 z"
+       id="path60865"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="szsss" />
+    <path
+       transform="matrix(0.08,0,0,0.07864223,0.67997314,-3.0961612)"
+       d="m 160.5,96.75 a 31.25,31.25 0 1 1 -62.5,0 31.25,31.25 0 1 1 62.5,0 z"
+       sodipodi:ry="31.25"
+       sodipodi:rx="31.25"
+       sodipodi:cy="96.75"
+       sodipodi:cx="129.25"
+       id="path60867"
+       style="opacity:0.7;color:#000000;fill:url(#radialGradient4503);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient4505);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path60869"
+       sodipodi:cx="129.25"
+       sodipodi:cy="96.75"
+       sodipodi:rx="31.25"
+       sodipodi:ry="31.25"
+       d="m 160.5,96.75 a 31.25,31.25 0 1 1 -62.5,0 31.25,31.25 0 1 1 62.5,0 z"
+       transform="matrix(0.064,0,0,0.064,2.7601141,-2.2271289)" />
+    <path
+       style="opacity:0.4526749;color:#000000;fill:url(#radialGradient4507);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 11.008371,1.1094001 c -1.3342069,0 -2.4157957,0.8195307 -2.4157957,1.8304732 0,0.072937 0.00655,0.1448365 0.017506,0.2155448 0.1414665,-0.9088054 1.1608496,-1.6132703 2.3982897,-1.6132703 1.237441,0 2.259013,0.7044649 2.400479,1.6132703 0.01095,-0.070708 0.01532,-0.1426079 0.01532,-0.2155448 0,-1.0109425 -1.081589,-1.8304732 -2.415797,-1.8304732 z"
+       id="path60871"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path60937"
+       d="m 6.5,12.5 c -1.98394,0.09219 -5,-1 -6,0.5"
+       style="color:#000000;fill:none;stroke:#5d5d5d;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cc" />
+    <path
+       transform="translate(-0.0107232,-1.0304587)"
+       d="m 12,4 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       sodipodi:ry="1"
+       sodipodi:rx="1"
+       sodipodi:cy="4"
+       sodipodi:cx="11"
+       id="path5308"
+       style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path5306"
+       sodipodi:cx="11"
+       sodipodi:cy="4"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 12,4 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="translate(0.0205268,2.0329775e-8)" />
+  </g>
+</svg>

=== modified file 'src/CheckerboardLayout.vala'
--- src/CheckerboardLayout.vala	2014-08-21 00:59:32 +0000
+++ src/CheckerboardLayout.vala	2014-10-18 00:49:47 +0000
@@ -357,13 +357,16 @@
 
     public Gdk.Pixbuf? get_image () {
         return pixbuf;
+    }    
+
+    public Gdk.Pixbuf? get_display_image () {
+        return display_pixbuf;
     }
 
     public void set_image (Gdk.Pixbuf pixbuf) {
         this.pixbuf = pixbuf;
         display_pixbuf = pixbuf;
         pixbuf_dim = Dimensions.for_pixbuf (pixbuf);
-
         recalc_size ("set_image");
         notify_view_altered ();
     }

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-09-29 15:08:44 +0000
+++ src/CollectionPage.vala	2014-10-18 00:49:47 +0000
@@ -604,6 +604,10 @@
         return false;
     }
 
+    public override bool is_map_display_enabled () {
+        return true;
+    }
+
     private void on_show_sidebar () {
         var app = AppWindow.get_instance () as LibraryWindow;
         app.set_metadata_sidebar_visible (!app.is_metadata_sidebar_visible ());

=== modified file 'src/MediaDataRepresentation.vala'
--- src/MediaDataRepresentation.vala	2014-08-08 21:13:09 +0000
+++ src/MediaDataRepresentation.vala	2014-10-18 00:49:47 +0000
@@ -351,6 +351,7 @@
         new Gee.TreeMultiMap < ImportID?, MediaSource > (ImportID.compare_func);
     private Gee.TreeSet < ImportID?> sorted_import_ids = new Gee.TreeSet < ImportID?> (ImportID.compare_func);
     private Gee.Set<MediaSource> flagged = new Gee.HashSet<MediaSource> ();
+    private Gee.Set<MediaSource> gps = new Gee.HashSet<MediaSource> ();
 
     // This signal is fired when MediaSources are added to the collection due to a successful import.
     // "items-added" and "contents-altered" will follow.
@@ -379,6 +380,9 @@
     }
 
     public virtual signal void flagged_contents_altered () {
+    }    
+
+    public virtual signal void gps_contents_altered () {
     }
 
     public MediaSourceCollection (string name, GetSourceDatabaseKey source_key_func) {
@@ -421,6 +425,18 @@
         return false;
     }
 
+    public static bool has_gps (Gee.Collection<MediaSource> media) {
+        foreach (MediaSource current_media in media) {
+            if (current_media is Photo) {
+                Photo photo = current_media as Photo;
+                if (photo.get_gps_coords ().has_gps > 0)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
     public static bool has_video (Gee.Collection<MediaSource> media) {
         foreach (MediaSource current_media in media) {
             if (current_media is Video) {
@@ -462,6 +478,10 @@
         flagged_contents_altered ();
     }
 
+    protected virtual void notify_gps_contents_altered () {
+        gps_contents_altered ();
+    }
+
     protected virtual void notify_media_import_starting (Gee.Collection<MediaSource> media) {
         media_import_starting (media);
     }
@@ -474,6 +494,7 @@
         Gee.ArrayList<MediaSource> to_trashcan = null;
         Gee.ArrayList<MediaSource> to_offline = null;
         bool flagged_altered = false;
+        bool gps_altered = false;
         foreach (DataObject object in items.keys) {
             Alteration alteration = items.get (object);
             MediaSource source = (MediaSource) object;
@@ -505,6 +526,14 @@
                 else
                     flagged_altered = flagged.remove (source) || flagged_altered;
             }
+
+            Photo? photo = source as Photo;
+            if (photo != null) {
+                if (photo.get_gps_coords ().has_gps > 0)
+                    gps_altered = gps.add (source) || gps_altered;
+                else
+                    gps_altered = gps.remove (source) || gps_altered;
+            }
         }
 
         if (to_trashcan != null)
@@ -514,7 +543,10 @@
             get_offline_bin ().unlink_and_hold (to_offline);
 
         if (flagged_altered)
-            notify_flagged_contents_altered ();
+            notify_flagged_contents_altered ();   
+
+        if (gps_altered)
+            notify_gps_contents_altered ();
 
         base.items_altered (items);
     }
@@ -523,6 +555,8 @@
             Gee.Iterable<DataObject>? removed) {
         bool import_roll_changed = false;
         bool flagged_altered = false;
+        bool gps_altered = false;
+
         if (added != null) {
             foreach (DataObject object in added) {
                 MediaSource media = (MediaSource) object;
@@ -545,6 +579,14 @@
                     else
                         flagged_altered = flagged.remove (media) || flagged_altered;
                 }
+
+                Photo? photo = media as Photo;
+                if (photo != null) {
+                    if (photo.get_gps_coords ().has_gps > 0)
+                        gps_altered = gps.add (media) || gps_altered;
+                    else
+                        gps_altered = gps.remove (media) || gps_altered;
+                }
             }
         }
 
@@ -567,6 +609,7 @@
                 }
 
                 flagged_altered = flagged.remove (media) || flagged_altered;
+                gps_altered = gps.remove (media) || gps_altered;
             }
         }
 
@@ -576,6 +619,9 @@
         if (flagged_altered)
             notify_flagged_contents_altered ();
 
+        if (gps_altered)
+            notify_gps_contents_altered ();
+
         base.notify_contents_altered (added, removed);
     }
 
@@ -611,6 +657,10 @@
 
     public Gee.Collection<MediaSource> get_flagged () {
         return flagged.read_only_view;
+    }    
+
+    public Gee.Collection<MediaSource> get_gps () {
+        return gps.read_only_view;
     }
 
     // The returned set of ImportID's is sorted from oldest to newest.

=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2014-08-28 14:41:02 +0000
+++ src/MediaPage.vala	2014-10-18 00:49:47 +0000
@@ -96,28 +96,17 @@
 }
 
 public abstract class MediaPage : CheckerboardPage {
-    public const int SORT_ORDER_ASCENDING = 0;
-    public const int SORT_ORDER_DESCENDING = 1;
-
-    // steppings should divide evenly into (Thumbnail.MAX_SCALE - Thumbnail.MIN_SCALE)
-    public const int MANUAL_STEPPING = 16;
-    public const int SLIDER_STEPPING = 4;
-
-    public enum SortBy {
-        MIN = 1,
-        TITLE = 1,
-        EXPOSURE_DATE = 2,
-        RATING = 3,
-        MAX = 3
-    }
-
-    protected class ZoomSliderAssembly : Gtk.ToolItem {
-        private Gtk.Scale slider;
+    public class ZoomSliderAssembly : Gtk.ToolItem {
+        public Gtk.Scale slider;
         private Gtk.Adjustment adjustment;
-
         public signal void zoom_changed ();
-
+        public int max_scale;
+        public int min_scale;
+        public int stepping;
         public ZoomSliderAssembly () {
+            max_scale = Thumbnail.MAX_SCALE;
+            min_scale = Thumbnail.MIN_SCALE;
+            stepping = SLIDER_STEPPING;
             Gtk.Box zoom_group = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 
             Gtk.Image zoom_out = new Gtk.Image.from_icon_name (Resources.ICON_ZOOM_OUT, Gtk.IconSize.MENU);
@@ -132,8 +121,8 @@
             // virgin ZoomSliderAssemblies are created such that they have whatever value is
             // persisted in the configuration system for the photo thumbnail scale
             int persisted_scale = Config.Facade.get_instance ().get_photo_thumbnail_scale ();
-            adjustment = new Gtk.Adjustment (ZoomSliderAssembly.scale_to_slider (persisted_scale), 0,
-                                             ZoomSliderAssembly.scale_to_slider (Thumbnail.MAX_SCALE), 1, 10, 0);
+            adjustment = new Gtk.Adjustment (scale_to_slider (persisted_scale), 0,
+                                             scale_to_slider (get_max_scale ()), 1, 10, 0);
 
             slider = new Gtk.Scale (Gtk.Orientation.HORIZONTAL, adjustment);
             slider.value_changed.connect (on_slider_changed);
@@ -155,18 +144,37 @@
             add (zoom_group);
         }
 
-        public static double scale_to_slider (int value) {
-            assert (value >= Thumbnail.MIN_SCALE);
-            assert (value <= Thumbnail.MAX_SCALE);
-
-            return (double) ((value - Thumbnail.MIN_SCALE) / SLIDER_STEPPING);
-        }
-
-        public static int slider_to_scale (double value) {
-            int res = ((int) (value * SLIDER_STEPPING)) + Thumbnail.MIN_SCALE;
-
-            assert (res >= Thumbnail.MIN_SCALE);
-            assert (res <= Thumbnail.MAX_SCALE);
+        public void set_slider_scale (int min, int max, int start) {
+            this.min_scale = min;
+            this.max_scale = max;
+            slider.adjustment = new Gtk.Adjustment (scale_to_slider (start), 0,
+                                             scale_to_slider (get_max_scale ()), 1, 10, 0);
+        }
+
+        public virtual int get_max_scale () {
+            return max_scale;
+        }
+
+        public virtual int get_min_scale () {
+            return min_scale;
+        }
+
+        public virtual int get_stepping () {
+            return stepping;
+        }
+
+        public double scale_to_slider (int value) {
+            assert (value >= get_min_scale ());
+            assert (value <= get_max_scale ());
+
+            return (double) ((value - get_min_scale ()) / get_stepping ());
+        }
+
+        public int slider_to_scale (double value) {
+            int res = ((int) (value * get_stepping ())) + get_min_scale ();
+
+            assert (res >= get_min_scale ());
+            assert (res <= get_max_scale ());
 
             return res;
         }
@@ -186,11 +194,11 @@
         }
 
         public void snap_to_min () {
-            slider.set_value (scale_to_slider (Thumbnail.MIN_SCALE));
+            slider.set_value (scale_to_slider (get_min_scale ()));
         }
 
         public void snap_to_max () {
-            slider.set_value (scale_to_slider (Thumbnail.MAX_SCALE));
+            slider.set_value (scale_to_slider (get_max_scale ()));
         }
 
         public void increase_step () {
@@ -223,6 +231,22 @@
         }
     }
 
+    public const int SORT_ORDER_ASCENDING = 0;
+    public const int SORT_ORDER_DESCENDING = 1;
+
+    // steppings should divide evenly into (Thumbnail.MAX_SCALE - Thumbnail.MIN_SCALE)
+    public const int MANUAL_STEPPING = 16;
+    public const int SLIDER_STEPPING = 4;
+
+
+    public enum SortBy {
+        MIN = 1,
+        TITLE = 1,
+        EXPOSURE_DATE = 2,
+        RATING = 3,
+        MAX = 3
+    }
+
     private ZoomSliderAssembly? connected_slider = null;
     private DragAndDropHandler dnd_handler = null;
     private MediaViewTracker tracker;
@@ -236,14 +260,14 @@
 
         get_view ().freeze_notifications ();
         get_view ().set_property (CheckerboardItem.PROP_SHOW_TITLES,
-                                 Config.Facade.get_instance ().get_display_photo_titles ());
+                                  Config.Facade.get_instance ().get_display_photo_titles ());
         get_view ().set_property (CheckerboardItem.PROP_SHOW_COMMENTS,
-                                 Config.Facade.get_instance ().get_display_photo_comments ());
+                                  Config.Facade.get_instance ().get_display_photo_comments ());
         get_view ().set_property (Thumbnail.PROP_SHOW_TAGS,
-                                 Config.Facade.get_instance ().get_display_photo_tags ());
+                                  Config.Facade.get_instance ().get_display_photo_tags ());
         get_view ().set_property (Thumbnail.PROP_SIZE, get_thumb_size ());
         get_view ().set_property (Thumbnail.PROP_SHOW_RATINGS,
-                                 Config.Facade.get_instance ().get_display_photo_ratings ());
+                                  Config.Facade.get_instance ().get_display_photo_ratings ());
         get_view ().thaw_notifications ();
 
         // enable drag-and-drop export of media
@@ -490,7 +514,7 @@
     }
 
     protected override void on_rating_widget_activate () {
-        on_set_rating (Resources.int_to_rating(rating_menu_item.rating_value));
+        on_set_rating (Resources.int_to_rating (rating_menu_item.rating_value));
     }
 
     private void update_development_menu_item_sensitivity () {
@@ -686,7 +710,7 @@
             break;
 
         case "5":
-            on_set_rating (Rating.FIVE);    
+            on_set_rating (Rating.FIVE);
             break;
 
         case "0":
@@ -900,7 +924,7 @@
 
         if (get_view ().get_selected_count () > 0) {
             get_command_manager ().execute (new TrashUntrashPhotosCommand (
-                                               (Gee.Collection<MediaSource>) get_view ().get_selected_sources (), true));
+                                                (Gee.Collection<MediaSource>) get_view ().get_selected_sources (), true));
         }
 
         if ((restore_point != null) && (get_view ().contains (restore_point))) {
@@ -1171,7 +1195,7 @@
     }
 
     public static Gtk.ToolButton create_sidebar_button () {
-        var show_sidebar_button = new Gtk.ToolButton (null,null);
+        var show_sidebar_button = new Gtk.ToolButton (null, null);
         show_sidebar_button.set_icon_name (Resources.SHOW_PANE);
         show_sidebar_button.set_label (Resources.TOGGLE_METAPANE_LABEL);
         show_sidebar_button.set_tooltip_text (Resources.TOGGLE_METAPANE_TOOLTIP);

=== modified file 'src/Page.vala'
--- src/Page.vala	2014-09-29 15:08:44 +0000
+++ src/Page.vala	2014-10-18 00:49:47 +0000
@@ -166,6 +166,10 @@
     protected virtual void on_rating_widget_activate () {
     }
 
+    public virtual bool is_map_display_enabled () {
+        return false;
+    }
+
     // This is called by the page
     // controller when it has removed this page ... pages should override
     // this (or the signal) to clean up
@@ -1323,6 +1327,10 @@
         Resources.style_widget (this, Resources.PAGE_STYLESHEET);
     }
 
+    protected CheckerboardPage.no_layout (string page_name) {
+        base (page_name);
+    }
+
     public void init_item_context_menu (string path) {
         item_context_menu_path = path;
     }
@@ -1379,7 +1387,7 @@
             KeyboardModifiers modifiers) {
     }
 
-    public CheckerboardLayout get_checkerboard_layout () {
+    public CheckerboardLayout? get_checkerboard_layout () {
         return layout;
     }
 
@@ -1391,7 +1399,8 @@
     }
 
     public override void switching_from () {
-        layout.set_in_view (false);
+        if (layout != null)
+            layout.set_in_view (false);
         get_search_view_filter ().refresh.disconnect (on_view_filter_refresh);
 
         // unselect everything so selection won't persist after page loses focus
@@ -1400,7 +1409,8 @@
     }
 
     public override void switched_to () {
-        layout.set_in_view (true);
+        if (layout != null)
+            layout.set_in_view (true);
         get_search_view_filter ().refresh.connect (on_view_filter_refresh);
         on_view_filter_refresh ();
 
@@ -1446,7 +1456,7 @@
         update_view_filter_message ();
     }
 
-    private void update_view_filter_message () {
+    protected virtual void update_view_filter_message () {
         var window = AppWindow.get_instance () as LibraryWindow;
         warn_if_fail (window != null);
         if (window != null)
@@ -1462,15 +1472,19 @@
     }
 
     public void set_page_message (string message) {
-        layout.set_message (message);
-        if (is_in_view ())
-            layout.queue_draw ();
+        if (layout != null) {
+            layout.set_message (message);
+            if (is_in_view ())
+                layout.queue_draw ();
+        }
     }
 
     public void unset_page_message () {
-        layout.unset_message ();
-        if (is_in_view ())
-            layout.queue_draw ();
+        if (layout != null) {
+            layout.unset_message ();
+            if (is_in_view ())
+                layout.queue_draw ();
+        }
     }
 
     public override void set_page_name (string name) {

=== modified file 'src/Photo.vala'
--- src/Photo.vala	2014-08-25 01:41:46 +0000
+++ src/Photo.vala	2014-10-18 00:49:47 +0000
@@ -158,7 +158,7 @@
 // particular photo without modifying the backing image file.  The interface allows for
 // transformations to be stored persistently elsewhere or in memory until they're committed en
 // masse to an image file.
-public abstract class Photo : PhotoSource, Dateable {
+public abstract class Photo : PhotoSource, Dateable, Positionable {
     // Need to use "thumb" rather than "photo" for historical reasons -- this name is used
     // directly to load thumbnails from disk by already-existing filenames
     public const string TYPENAME = "thumb";
@@ -241,7 +241,7 @@
 
         public PhotoTransformationStateImpl (Photo photo, Orientation orientation,
                                              Gee.HashMap<string, KeyValueMap>? transformations, PixelTransformer? transformer,
-                                             PixelTransformationBundle? adjustments,Gee.HashMap<string, KeyValueMap>? original_transformations, bool enhanced) {
+                                             PixelTransformationBundle? adjustments, Gee.HashMap<string, KeyValueMap>? original_transformations, bool enhanced) {
             this.photo = photo;
             this.orientation = orientation;
             this.transformations = copy_transformations (transformations);
@@ -266,7 +266,7 @@
 
         public Gee.HashMap<string, KeyValueMap>? get_transformations () {
             return copy_transformations (transformations);
-        }        
+        }
 
         public Gee.HashMap<string, KeyValueMap>? get_original_transformations () {
             return copy_transformations (original_transformations);
@@ -1171,6 +1171,7 @@
         Orientation orientation = Orientation.TOP_LEFT;
         time_t exposure_time = 0;
         string title = "";
+        GpsCoords gps_coords = GpsCoords();
         string comment = "";
         Rating rating = Rating.UNRATED;
 
@@ -1186,6 +1187,7 @@
 
             orientation = detected.metadata.get_orientation ();
             title = detected.metadata.get_title ();
+            gps_coords = detected.metadata.get_gps_coords();
             comment = detected.metadata.get_comment ();
             params.keywords = detected.metadata.get_keywords ();
             rating = detected.metadata.get_rating ();
@@ -1221,6 +1223,7 @@
         params.row.flags = 0;
         params.row.master.file_format = detected.file_format;
         params.row.title = title;
+        params.row.gps_coords = gps_coords;
         params.row.comment = comment;
         params.row.rating = rating;
 
@@ -1261,6 +1264,7 @@
         params.row.flags = 0;
         params.row.master.file_format = PhotoFileFormat.JFIF;
         params.row.title = null;
+        params.row.gps_coords = GpsCoords();
         params.row.comment = null;
         params.row.rating = Rating.UNRATED;
 
@@ -1414,6 +1418,8 @@
             updated_row.master.original_orientation = backing.original_orientation;
         }
 
+        GpsCoords gps_coords = GpsCoords ();
+
         if (detected.metadata != null) {
             MetadataDateTime? date_time = detected.metadata.get_exposure_date_time ();
             if (date_time != null && updated_row.exposure_time != date_time.get_timestamp ())
@@ -1422,6 +1428,10 @@
             if (updated_row.title != detected.metadata.get_title ())
                 list += "metadata:name";
 
+            gps_coords = detected.metadata.get_gps_coords ();
+            if (updated_row.gps_coords != gps_coords)
+                list += "metadata:gps";
+
             if (updated_row.comment != detected.metadata.get_comment ())
                 list += "metadata:comment";
 
@@ -1442,6 +1452,7 @@
             if (date_time != null)
                 updated_row.exposure_time = date_time.get_timestamp ();
 
+            updated_row.gps_coords = gps_coords;
             updated_row.title = detected.metadata.get_title ();
             updated_row.comment = detected.metadata.get_comment ();
             updated_row.rating = detected.metadata.get_rating ();
@@ -1551,6 +1562,7 @@
         }
 
         if (reimport_state.metadata != null) {
+            set_gps_coords (reimport_state.metadata.get_gps_coords());
             set_title (reimport_state.metadata.get_title ());
             set_comment (reimport_state.metadata.get_comment ());
             set_rating (reimport_state.metadata.get_rating ());
@@ -1961,6 +1973,12 @@
         return row.event_id;
     }
 
+    public string get_location () {
+        lock (row) {
+            return row.location;
+        }
+    }
+
     // This is NOT thread-safe.
     public inline int64 get_raw_event_id () {
         return row.event_id.id;
@@ -2132,7 +2150,7 @@
 
         if (committed)
             notify_altered (new Alteration ("metadata", "master-dirty"));
-    }    
+    }
 
     public bool is_enhanced () {
         lock (row) {
@@ -2216,6 +2234,17 @@
         }
     }
 
+    public bool set_location (string? location) {
+        lock (row) {
+            bool committed = PhotoTable.get_instance ().set_location (row.photo_id, location);
+
+            if (committed)
+                row.location = location;
+
+            return committed;
+        }
+    }
+
     public override string to_string () {
         return "[%s] %s%s".printf (get_photo_id ().id.to_string (), get_master_reader ().get_filepath (),
                                    !is_master_baseline () ? " (" + get_actual_file ().get_path () + ")" : "");
@@ -2552,7 +2581,7 @@
 
             return adjustments.copy ();
         }
-    } 
+    }
 
     // This method *must* be called with row locked.
     private PixelTransformationBundle locked_original_color_adjustments () {
@@ -2563,14 +2592,14 @@
             map = row.original_transforms.get ("adjustments");
             if (map != null)
                 map = map.copy ();
-        } else 
+        } else
             map = new KeyValueMap ("adjustments");
 
         if (map == null)
             original_adjustments.set_to_identity ();
         else
             original_adjustments.load (map);
-            
+
         return original_adjustments;
     }
 
@@ -2580,7 +2609,7 @@
         lock (row) {
             KeyValueMap map = get_transformation ("adjustments");
             if (map == null)
-                map = new KeyValueMap("adjustments");
+                map = new KeyValueMap ("adjustments");
             return map;
         }
     }
@@ -2602,7 +2631,7 @@
         return get_color_adjustments ().get_transformation (type);
     }
 
-    public void set_color_adjustments (PixelTransformationBundle new_adjustments) {  
+    public void set_color_adjustments (PixelTransformationBundle new_adjustments) {
         /* if every transformation in 'new_adjustments' is the identity, then just remove all
            adjustments from the database */
         set_enhanced (false);
@@ -2749,6 +2778,28 @@
         }
     }
 
+    public GpsCoords get_gps_coords () {
+        lock (row) {
+            return row.gps_coords;
+        }
+    }
+
+    public void set_gps_coords (GpsCoords gps_coords) {
+        DatabaseError dberr = null;
+        lock (row) {
+            try {
+                PhotoTable.get_instance ().set_gps_coords (row.photo_id, gps_coords);
+                row.gps_coords = gps_coords;
+            } catch (DatabaseError err) {
+                dberr = err;
+            }
+        }
+        if (dberr == null)
+            notify_altered (new Alteration ("metadata", "gps"));
+        else
+            warning ("Unable to write gps coordinates for %s: %s", to_string (), dberr.message);
+    }
+
     public bool has_alterations () {
         MetadataDateTime? date_time = null;
         string? title = null;
@@ -2930,7 +2981,7 @@
 
             return PhotoTable.get_instance ().set_original_transforms (row.photo_id, trans);
         }
-    }    
+    }
 
     private bool clear_original_transforms () {
         lock (row) {
@@ -3575,7 +3626,7 @@
         debug ("Exporting full-sized copy of %s to %s", to_string (), writer.get_filepath ());
 
         export_reader.get_file ().copy (dest_file,
-                                       FileCopyFlags.OVERWRITE | FileCopyFlags.TARGET_DEFAULT_PERMS, null, null);
+                                        FileCopyFlags.OVERWRITE | FileCopyFlags.TARGET_DEFAULT_PERMS, null, null);
 
         // If asking for an full-sized file and there are no alterations (transformations or EXIF)
         // *and* this is a copy of the original backing *and* there's no user metadata or title *and* metadata should be exported, then done
@@ -4422,7 +4473,7 @@
         apply_timer.stop ();
         debug ("Auto-Enhance apply time: %f sec", apply_timer.elapsed ());
 #endif
-        set_enhanced(true);
+        set_enhanced (true);
         return true;
     }
 
@@ -4437,8 +4488,7 @@
                     transformer = null;
                     if (result)
                         notify_altered (new Alteration ("image", "color-adjustments"));
-                }
-                else
+                } else
                     set_color_adjustments (locked_original_color_adjustments ());
                 set_enhanced (false);
                 return true;
@@ -4971,6 +5021,11 @@
         this.import_keywords = null;
 
         thumbnail_scheduler = new OneShotScheduler ("LibraryPhoto", generate_thumbnails);
+        // import gps coords of photos imported with prior versions of shotwell
+        if (row.gps_coords.has_gps == -1) {
+            var gps_import_scheduler = new OneShotScheduler ("LibraryPhoto", import_gps_metadata);
+            gps_import_scheduler.at_priority_idle (Priority.LOW);
+        }
 
         // if marked in a state where they're held in an orphanage, rehydrate their backlinks
         if ((row.flags & (FLAG_TRASH | FLAG_OFFLINE)) != 0)
@@ -5079,6 +5134,11 @@
         global.notify_baseline_reimported (this, metadata);
     }
 
+    private void import_gps_metadata () {
+        GpsCoords gps_coords = get_metadata ().get_gps_coords ();
+        set_gps_coords (gps_coords);
+    }
+
     private void generate_thumbnails () {
         try {
             ThumbnailCache.import_from_source (this, true);

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-09-13 03:34:09 +0000
+++ src/PhotoPage.vala	2014-10-18 00:49:47 +0000
@@ -567,6 +567,10 @@
         app.set_metadata_sidebar_visible (!app.is_metadata_sidebar_visible ());
         update_sidebar_action (!app.is_metadata_sidebar_visible ());
     }
+    
+    public override bool is_map_display_enabled () {
+        return true;
+    }
 
     private void on_zoom_slider_value_changed () {
         ZoomState new_zoom_state = ZoomState.rescale (get_zoom_state (), zoom_slider.get_value ());

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-10-07 03:15:08 +0000
+++ src/Resources.vala	2014-10-18 00:49:47 +0000
@@ -88,6 +88,13 @@
 public const string PUBLISH = "applications-internet";
 public const string EDIT_FLAG= "edit-flag";
 public const string MERGE = "object-merge";
+public const string MAP_PAGE = "places";
+
+public const string ICON_GPS_MARKER = "gps-marker.svg";
+public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected.svg";
+public const string MAP = "applications-geography";
+public const string MAP_GEOLOGY = "applications-geology";
+public const string MAP_EARTH = "earth_map.svg";
 
 public const string ICON_APP = "multimedia-photo-manager";
 public const string ICON_APP16 = "multimedia-photo-manager";
@@ -793,7 +800,8 @@
 
     File icons_dir = AppDirs.get_resources_dir ().get_child ("icons");
     add_stock_icon (icons_dir.get_child ("pin-toolbar.svg"), PIN_TOOLBAR);
-
+	add_stock_icon (icons_dir.get_child ("earth_map.svg"), MAP_EARTH);
+	add_stock_icon_from_themed_icon (new GLib.ThemedIcon (MAP_PAGE), MAP_PAGE);
     add_stock_icon_from_themed_icon (new GLib.ThemedIcon (ADJUST), ADJUST);
     add_stock_icon_from_themed_icon (new GLib.ThemedIcon (ICON_SINGLE_PHOTO), ICON_SINGLE_PHOTO);
     add_stock_icon_from_themed_icon (new GLib.ThemedIcon (ICON_CAMERAS), ICON_CAMERAS);

=== modified file 'src/SearchFilter.vala'
--- src/SearchFilter.vala	2014-08-28 12:44:53 +0000
+++ src/SearchFilter.vala	2014-10-18 00:49:47 +0000
@@ -345,8 +345,16 @@
     private Gtk.SearchEntry search_entry;
     private Gtk.ComboBoxText rating_button;
     private SearchViewFilter? search_filter = null;
-    private Gtk.Toolbar toolbar;
+    public Gtk.Toolbar toolbar;
+    private Gtk.Label label_type;
+    private Gtk.Label label_flagged;
     private Gtk.Label label_rating;
+    private Gtk.ToggleToolButton toolbtn_photos;
+    private Gtk.ToggleToolButton toolbtn_videos;
+    private Gtk.ToggleToolButton toolbtn_raw;
+    private Gtk.ToggleToolButton toolbtn_flag;
+    private Gtk.SeparatorToolItem sepr_mediatype_flagged;
+    private Gtk.SeparatorToolItem sepr_flagged_rating;
 
     public SearchFilterToolbar () {
         toolbar = new Gtk.Toolbar ();
@@ -361,6 +369,60 @@
         close_item.activate.connect ( () => close ());
         close_menu.append (close_item);
 
+        // Type label and toggles
+        label_type = new Gtk.Label (_ ("Type"));
+        Gtk.ToolItem label_type_item = new Gtk.ToolItem ();
+        label_type_item.add (label_type);
+        toolbar.insert (label_type_item, -1);
+
+        toolbtn_photos = new Gtk.ToggleToolButton ();
+        var photos_icon = new Gtk.Image.from_icon_name ("folder-pictures", Gtk.IconSize.MENU);
+        photos_icon.pixel_size = 16;
+        toolbtn_photos.set_icon_widget (photos_icon);
+        toolbtn_photos.tooltip_text = _ ("Photos");
+        toolbtn_photos.toggled.connect (on_photos_toggled);
+
+        toolbtn_videos = new Gtk.ToggleToolButton ();
+        var videos_icon = new Gtk.Image.from_icon_name ("folder-videos", Gtk.IconSize.MENU);
+        videos_icon.pixel_size = 16;
+        toolbtn_videos.set_icon_widget (videos_icon);
+        toolbtn_videos.tooltip_text = _ ("Videos");
+        toolbtn_videos.toggled.connect (on_videos_toggled);
+
+        toolbtn_raw = new Gtk.ToggleToolButton ();
+        var raw_icon = new Gtk.Image.from_icon_name ("accessories-camera", Gtk.IconSize.MENU);
+        raw_icon.pixel_size = 16;
+        toolbtn_raw.set_icon_widget (raw_icon);
+        toolbtn_raw.tooltip_text = _ ("RAW photos");
+        toolbtn_raw.toggled.connect (on_raw_toggled);
+
+        toolbar.insert (toolbtn_photos, -1);
+        toolbar.insert (toolbtn_videos, -1);
+        toolbar.insert (toolbtn_raw, -1);
+
+        // separator
+        sepr_mediatype_flagged = new Gtk.SeparatorToolItem ();
+        toolbar.insert (sepr_mediatype_flagged, -1);
+
+        // Flagged label and toggle
+        label_flagged = new Gtk.Label (_ ("Flagged"));
+        Gtk.ToolItem label_flagged_item = new Gtk.ToolItem ();
+        label_flagged_item.add (label_flagged);
+        toolbar.insert (label_flagged_item, -1);
+
+        toolbtn_flag = new Gtk.ToggleToolButton ();
+
+        var flag_icon = new Gtk.Image.from_icon_name (Resources.ICON_FLAGGED_PAGE, Gtk.IconSize.MENU);
+        flag_icon.pixel_size = 16;
+        toolbtn_flag.set_icon_widget (flag_icon);
+        toolbtn_flag.tooltip_text = _ ("Flagged");
+        toolbtn_flag.toggled.connect (on_flagged_toggled);
+        toolbar.insert (toolbtn_flag, -1);
+
+        // separator
+        sepr_flagged_rating = new Gtk.SeparatorToolItem ();
+        toolbar.insert (sepr_flagged_rating, -1);
+
         // Rating label and button
         label_rating = new Gtk.Label (_ ("Rating"));
         Gtk.ToolItem label_rating_item = new Gtk.ToolItem ();
@@ -427,6 +489,22 @@
         return false;
     }
 
+    private void on_flagged_toggled () {
+        update ();
+    }
+
+    private void on_videos_toggled () {
+        update ();
+    }
+
+    private void on_photos_toggled () {
+        update ();
+    }
+
+    private void on_raw_toggled () {
+        update ();
+    }
+
     private void on_search_text_changed () {
         update ();
     }
@@ -487,6 +565,10 @@
         assert (null != search_filter);
 
         search_filter.set_search_filter (search_entry.text);
+        search_filter.flagged = toolbtn_flag.active;
+        search_filter.show_media_video = toolbtn_videos.active;
+        search_filter.show_media_photos = toolbtn_photos.active;
+        search_filter.show_media_raw = toolbtn_raw.active;
 
         search_filter.set_rating_filter (filter);
         rating_button.tooltip_text = Resources.get_rating_filter_tooltip (filter);
@@ -498,6 +580,21 @@
         rating_button.visible = ((criteria & SearchFilterCriteria.RATING) != 0);
         label_rating.visible = ((criteria & SearchFilterCriteria.RATING) != 0);
 
+        label_flagged.visible = ((criteria & SearchFilterCriteria.FLAG) != 0);
+        toolbtn_flag.visible = ((criteria & SearchFilterCriteria.FLAG) != 0);
+
+        label_type.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
+        toolbtn_photos.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
+        toolbtn_videos.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
+        toolbtn_raw.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
+
+        // Ticket #3290, part IV - ensure that the separators
+        // are shown and/or hidden as needed.
+        sepr_mediatype_flagged.visible = (label_type.visible && label_flagged.visible);
+
+        sepr_flagged_rating.visible = ((label_type.visible && label_rating.visible) ||
+                                       (label_flagged.visible && label_rating.visible));
+
         // Send update to view collection.
         search_filter.refresh ();
     }

=== modified file 'src/Thumbnail.vala'
--- src/Thumbnail.vala	2014-08-23 09:56:14 +0000
+++ src/Thumbnail.vala	2014-10-18 00:49:47 +0000
@@ -34,17 +34,18 @@
 
     private const int HQ_IMPROVEMENT_MSEC = 100;
 
+    protected int scale;
+    protected Cancellable cancellable = null;
+    protected Dimensions dim;
+    protected Dimensions original_dim;
+    // this is cached locally because there are situations where the constant calls to is_exposed ()
+    // was showing up in sysprof
+    protected bool exposure = false;
+    protected Gdk.Pixbuf unscaled_pixbuf = null;
+
     private MediaSource media;
-    private int scale;
-    private Dimensions original_dim;
-    private Dimensions dim;
-    private Gdk.Pixbuf unscaled_pixbuf = null;
-    private Cancellable cancellable = null;
     private bool hq_scheduled = false;
     private bool hq_reschedule = false;
-    // this is cached locally because there are situations where the constant calls to is_exposed ()
-    // was showing up in sysprof
-    private bool exposure = false;
 
     public Thumbnail (MediaSource media, int scale = DEFAULT_SCALE) {
         base (media, media.get_dimensions ().get_scaled (scale, true), media.get_name (),
@@ -251,7 +252,7 @@
         base.notify_collection_property_set (name, old, val);
     }
 
-    private void resize (int new_scale) {
+    public virtual void resize (int new_scale) {
         assert (new_scale >= MIN_SCALE);
         assert (new_scale <= MAX_SCALE);
 
@@ -328,7 +329,7 @@
         return false;
     }
 
-    private void cancel_async_fetch () {
+    protected void cancel_async_fetch () {
         // cancel outstanding I/O
         if (cancellable != null)
             cancellable.cancel ();

=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2014-09-27 23:06:48 +0000
+++ src/camera/ImportPage.vala	2014-10-18 00:49:47 +0000
@@ -169,7 +169,7 @@
 
         return !is_string_empty (title) ? title : get_filename ();
     }
-
+    
     public override string get_typename () {
         return "photoimport";
     }

=== modified file 'src/core/SourceInterfaces.vala'
--- src/core/SourceInterfaces.vala	2014-08-08 21:13:09 +0000
+++ src/core/SourceInterfaces.vala	2014-10-18 00:49:47 +0000
@@ -42,3 +42,19 @@
     }
 }
 
+// Positionable DataSources provide a globally locatable point in longitude and latitude degrees
+
+public struct GpsCoords {
+    public int has_gps;
+    public double latitude;
+    public double longitude;
+    public bool equals (ref GpsCoords gps) {
+        return (has_gps == 0 && gps.has_gps == 0) || (latitude == gps.latitude && longitude == gps.longitude);
+    }
+}
+
+public interface Positionable : DataSource {
+    public abstract GpsCoords get_gps_coords ();
+    public abstract void set_gps_coords(GpsCoords gps_coords);
+}
+

=== modified file 'src/db/DatabaseTable.vala'
--- src/db/DatabaseTable.vala	2014-08-15 07:12:57 +0000
+++ src/db/DatabaseTable.vala	2014-10-18 00:49:47 +0000
@@ -21,7 +21,7 @@
      * tables are created on demand and tables and columns are easily ignored when already present.
      * However, the change should be noted in upgrade_database () as a comment.
      ***/
-    public const int SCHEMA_VERSION = 21;
+    public const int SCHEMA_VERSION = 22;
 
     protected static Sqlite.Database db;
 
@@ -269,6 +269,18 @@
         if (res != Sqlite.DONE)
             throw_error ("DatabaseTable.update_int64_by_id_2 %s.%s".printf (table_name, column), res);
     }
+    
+    protected void update_double_by_id_2(int64 id, string column, double value) throws DatabaseError {
+        Sqlite.Statement stmt;
+        prepare_update_by_id(id, column, out stmt);
+
+        int res = stmt.bind_double(1, value);
+        assert(res == Sqlite.OK);
+
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("DatabaseTable.update_double_by_id_2 %s.%s".printf(table_name, column), res);
+    }
 
     protected void delete_by_id (int64 id) throws DatabaseError {
         Sqlite.Statement stmt;

=== modified file 'src/db/Db.vala'
--- src/db/Db.vala	2014-08-15 07:12:57 +0000
+++ src/db/Db.vala	2014-10-18 00:49:47 +0000
@@ -372,6 +372,22 @@
     }
     version = 21;
 
+    //
+    // Version 22:
+    // * Add has_gps, gps_lat and gps_lon columns to PhotoTable
+    if (!DatabaseTable.ensure_column("PhotoTable", "has_gps", "INTEGER DEFAULT -1",
+        "upgrade_database: adding gps_lat column to PhotoTable")
+        || !DatabaseTable.ensure_column("PhotoTable", "gps_lat", "REAL",
+        "upgrade_database: adding gps_lat column to PhotoTable")
+        || !DatabaseTable.ensure_column("PhotoTable", "gps_lon", "REAL",
+        "upgrade_database: adding gps_lon column to PhotoTable")
+        || !DatabaseTable.ensure_column("PhotoTable", "location", "TEXT",
+        "upgrade_database: adding location column to PhotoTable")) {
+        return VerifyResult.UPGRADE_ERROR;
+    }
+
+    version = 22;
+
     assert (version == DatabaseTable.SCHEMA_VERSION);
     VersionTable.get_instance ().update_version (version, Resources.APP_VERSION);
 

=== added file 'src/db/GeoLocationTable.vala'
--- src/db/GeoLocationTable.vala	1970-01-01 00:00:00 +0000
+++ src/db/GeoLocationTable.vala	2014-10-18 00:49:47 +0000
@@ -0,0 +1,205 @@
+/* Copyright 2011-2013 Yorba Foundation
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public struct LocationID {
+    public const int64 INVALID = -1;
+
+    public int64 id;
+
+    public LocationID (int64 id = INVALID) {
+        this.id = id;
+    }
+
+    public bool is_invalid () {
+        return (id == INVALID);
+    }
+
+    public bool is_valid () {
+        return (id != INVALID);
+    }
+}
+
+public class LocationRow {
+    public LocationID location_id;
+    public string? city;
+    public string? territorie;
+    public string? country;
+    public double latitude;
+    public double longitude;
+}
+
+private class InitLocationDataJob : BackgroundJob {
+    public InitLocationDataJob (AppWindow owner, CompletionCallback completion_callback) {
+        base (owner, completion_callback);
+    }
+
+    public override void execute () {
+        FileStream stream = FileStream.open (
+                   AppDirs.get_resources_dir ().get_child ("ui").get_child ("locations.dat").get_parse_name (), "r");
+        if (stream == null) {
+            debug ("failed to open initial location data file");
+            return;
+        }
+
+        var line = stream.read_line ();
+        while (line != null) {
+            var row = line.split ("|");
+            try {
+                LocationTable.get_instance ().create (row);
+            } catch {
+                critical ("Could not load initial geo data");
+            }
+            line = stream.read_line ();
+        }
+    }
+}
+// This is used when we are offline to make geo location look ups
+// as glib.geocode relies on the web
+public class LocationTable : DatabaseTable {
+    private static LocationTable instance = null;
+    private Workers workers;
+
+    private LocationTable () {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2 ("CREATE TABLE IF NOT EXISTS LocationTable ("
+                                 + "id INTEGER PRIMARY KEY, "
+                                 + "city TEXT, "
+                                 + "territorie TEXT, "
+                                 + "country TEXT, "
+                                 + "lat REAL, "
+                                 + "lon REAL "
+                                 + ")", -1, out stmt);
+        assert (res == Sqlite.OK);
+
+        res = stmt.step ();
+        if (res != Sqlite.DONE)
+            fatal ("create location table", res);
+
+        set_table_name ("LocationTable");
+    }
+
+    public static LocationTable get_instance () {
+        if (instance == null)
+            instance = new LocationTable ();
+        return instance;
+    }
+
+    public void init_city_data () {
+        // clear out the table first incase it got cut off last time
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2 ("DELETE FROM LocationTable", -1, out stmt);
+        assert (res == Sqlite.OK);
+
+        res = stmt.step ();
+        if (res != Sqlite.DONE)
+            fatal ("clear location table", res);
+
+        workers = new Workers (1, false);
+        BackgroundJob init_job = new InitLocationDataJob (AppWindow.get_instance (), on_init_complete);
+        workers.enqueue (init_job);
+    }
+
+    private void on_init_complete (BackgroundJob job) {
+        insert_init_row ();
+    }
+
+    // We use a row to set init finished instead of a transaction
+    // as we want to have location rows coming in so there is at least
+    // some data before it is finished
+    private void insert_init_row () {
+        try {
+            create ("photos-init-complete| | |-1|-1".split ("|"));
+        } catch {
+            critical ("location table init complete failed");
+        }
+    }
+
+    public bool has_init_row () {
+        return (get_starts_with ("photos-init-complete").size > 0);
+    }
+
+    public void create (string[] location) throws DatabaseError {
+        if (location == null || location.length < 1)
+            return;
+
+        var city = location[0];
+        var lat = location[1];
+        var lon = location[2];
+        var territorie = Resources.get_state (location[3], location[4]);
+        var country = Resources.get_country (location[3]);
+
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2 (
+            "INSERT INTO LocationTable (city, territorie, country, lat, lon) VALUES (?, ?, ?, ?, ?)",
+            -1, out stmt);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (1, city);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (2, territorie);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (3, country);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (4, double.parse (lat));
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (5, double.parse (lon));
+        assert (res == Sqlite.OK);
+
+        res = stmt.step ();
+        if (res != Sqlite.DONE)
+            throw_error ("LocationTable.create", res);
+    }
+
+    public Gee.ArrayList < LocationRow?> get_starts_with (string starts_with) {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2 (
+                      "SELECT id, city, territorie, country, lat, lon FROM LocationTable WHERE city LIKE ?",
+                      -1, out stmt);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (1, starts_with + "%");
+        assert (res == Sqlite.OK);
+
+        Gee.ArrayList < LocationRow?> all = new Gee.ArrayList < LocationRow?> ();
+
+        while ((res = stmt.step ()) == Sqlite.ROW) {
+            LocationRow row = new LocationRow ();
+            row.location_id = LocationID (stmt.column_int64 (0));
+            row.city = stmt.column_text (1);
+            row.territorie = stmt.column_text (2);
+            row.country = stmt.column_text (3);
+            row.latitude = stmt.column_double (4);
+            row.longitude = stmt.column_double (5);
+            all.add (row);
+        }
+
+        return all;
+    }
+
+    public LocationRow? get_row (LocationID id) {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2 (
+                      "SELECT city, territorie, country, lat, lon FROM LocationTable WHERE id=?",
+                      -1, out stmt);
+        assert (res == Sqlite.OK);
+
+        res = stmt.bind_int64 (1, id.id);
+        assert (res == Sqlite.OK);
+
+        if (stmt.step () != Sqlite.ROW)
+            return null;
+
+        LocationRow row = new LocationRow ();
+        row.location_id = id;
+        row.city = stmt.column_text (0);
+        row.territorie = stmt.column_text (1);
+        row.country = stmt.column_text (2);
+        row.latitude = stmt.column_double (3);
+        row.longitude = stmt.column_double (4);
+
+        return row;
+    }
+}
+
+

=== modified file 'src/db/PhotoTable.vala'
--- src/db/PhotoTable.vala	2014-08-27 12:50:03 +0000
+++ src/db/PhotoTable.vala	2014-10-18 00:49:47 +0000
@@ -84,6 +84,7 @@
     public uint64 flags;
     public Rating rating;
     public string title;
+    public GpsCoords gps_coords;
     public string comment;
     public string? backlinks;
     public time_t time_reimported;
@@ -91,6 +92,7 @@
     public bool metadata_dirty;
     public bool enhanced;
     public Gee.HashMap<string, KeyValueMap>? original_transforms;
+    public string location;
 
     // Currently selected developer (RAW only)
     public RawDeveloper developer;
@@ -102,6 +104,7 @@
     public PhotoRow () {
         master = new BackingPhotoRow ();
         editable_id = BackingPhotoID ();
+        gps_coords = GpsCoords ();
         development_ids = new BackingPhotoID[RawDeveloper.as_array ().length];
         foreach (RawDeveloper d in RawDeveloper.as_array ())
             development_ids[d] = BackingPhotoID ();
@@ -144,7 +147,11 @@
                                  + "develop_embedded_id INTEGER DEFAULT -1, "
                                  + "comment TEXT, "
                                  + "enhanced INTEGER DEFAULT 0, "
-                                 + "original_transforms TEXT "
+                                 + "original_transforms TEXT, "
+                                 + "has_gps INTEGER DEFAULT -1, "
+                                 + "gps_lat REAL, "
+                                 + "gps_lon REAL, "
+                                 + "location TEXT"
                                  + ")", -1, out stmt);
         assert (res == Sqlite.OK);
 
@@ -179,8 +186,9 @@
         int res = db.prepare_v2 (
                       "INSERT INTO PhotoTable (filename, width, height, filesize, timestamp, exposure_time, "
                       + "orientation, original_orientation, import_id, event_id, md5, thumbnail_md5, "
-                      + "exif_md5, time_created, file_format, title, rating, editable_id, developer, comment) "
-                      + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                      + "exif_md5, time_created, file_format, title, rating, editable_id, developer, "
+                      + "comment, has_gps, gps_lat, gps_lon, location) "
+                      + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                       -1, out stmt);
         assert (res == Sqlite.OK);
 
@@ -226,6 +234,14 @@
         assert (res == Sqlite.OK);
         res = stmt.bind_text (20, photo_row.comment);
         assert (res == Sqlite.OK);
+        res = stmt.bind_int (21, photo_row.gps_coords.has_gps);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (22, photo_row.gps_coords.latitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (23, photo_row.gps_coords.longitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (24, photo_row.location);
+        assert (res == Sqlite.OK);
 
         res = stmt.step ();
         if (res != Sqlite.DONE) {
@@ -255,7 +271,8 @@
         int res = db.prepare_v2 (
             "UPDATE PhotoTable SET width = ?, height = ?, filesize = ?, timestamp = ?, "
             + "exposure_time = ?, orientation = ?, original_orientation = ?, md5 = ?, "
-            + "exif_md5 = ?, thumbnail_md5 = ?, file_format = ?, title = ?, time_reimported = ? "
+            + "exif_md5 = ?, thumbnail_md5 = ?, file_format = ?, title = ?, "
+            + "has_gps = ?, gps_lat = ?, gps_lon = ?, time_reimported = ? "
             + "WHERE id = ?", -1, out stmt);
         assert (res == Sqlite.OK);
 
@@ -285,9 +302,15 @@
         assert (res == Sqlite.OK);
         res = stmt.bind_text (12, row.title);
         assert (res == Sqlite.OK);
-        res = stmt.bind_int64 (13, time_reimported);
-        assert (res == Sqlite.OK);
-        res = stmt.bind_int64 (14, row.photo_id.id);
+        res = stmt.bind_int (13, row.gps_coords.has_gps);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (14, row.gps_coords.latitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (15, row.gps_coords.longitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_int64 (16, time_reimported);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_int64 (17, row.photo_id.id);
         assert (res == Sqlite.OK);
 
         res = stmt.step ();
@@ -360,7 +383,8 @@
                       + "original_orientation, import_id, event_id, transformations, md5, thumbnail_md5, "
                       + "exif_md5, time_created, flags, rating, file_format, title, backlinks, "
                       + "time_reimported, editable_id, metadata_dirty, developer, develop_shotwell_id, "
-                      + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms "
+                      + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms, "
+                      + "has_gps, gps_lat, gps_lon, location "
                       + "FROM PhotoTable WHERE id=?",
                       -1, out stmt);
         assert (res == Sqlite.OK);
@@ -403,6 +427,10 @@
         row.comment = stmt.column_text (27);
         row.enhanced = stmt.column_int (28) != 0;
         row.original_transforms = marshall_all_transformations (stmt.column_text (29));
+        row.gps_coords.has_gps = stmt.column_int (30);
+        row.gps_coords.latitude = stmt.column_double (31);
+        row.gps_coords.longitude = stmt.column_double (32);
+        row.location = stmt.column_text (33);
 
         return row;
     }
@@ -414,7 +442,8 @@
                       + "original_orientation, import_id, event_id, transformations, md5, thumbnail_md5, "
                       + "exif_md5, time_created, flags, rating, file_format, title, backlinks, time_reimported, "
                       + "editable_id, metadata_dirty, developer, develop_shotwell_id, develop_camera_id, "
-                      + "develop_embedded_id, comment, enhanced, original_transforms FROM PhotoTable",
+                      + "develop_embedded_id, comment, enhanced, original_transforms, has_gps, gps_lat, gps_lon, "
+                      + "location  FROM PhotoTable",
                       -1, out stmt);
         assert (res == Sqlite.OK);
 
@@ -454,6 +483,10 @@
             row.enhanced = stmt.column_int (29) != 0;
             row.original_transforms = marshall_all_transformations (stmt.column_text (30));
             validate_orientation (row);
+            row.gps_coords.has_gps = stmt.column_int (31);
+            row.gps_coords.latitude = stmt.column_double (32);
+            row.gps_coords.longitude = stmt.column_double (33);
+            row.location = stmt.column_text (34);
 
             all.add (row);
         }
@@ -474,8 +507,8 @@
                                  + "timestamp, exposure_time, orientation, original_orientation, import_id, event_id, "
                                  + "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, rating, "
                                  + "file_format, title, editable_id, developer, develop_shotwell_id, develop_camera_id, "
-                                 + "develop_embedded_id, comment, enhanced, original_transforms) "
-                                 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                                 + "develop_embedded_id, comment, enhanced, original_transforms, has_gps, gps_lat, gps_lon, location) "
+                                 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                                  -1, out stmt);
         assert (res == Sqlite.OK);
 
@@ -519,7 +552,6 @@
         assert (res == Sqlite.OK);
         res = stmt.bind_int64 (20, editable_id.id);
         assert (res == Sqlite.OK);
-
         res = stmt.bind_text (21, original.developer.to_string ());
         assert (res == Sqlite.OK);
         res = stmt.bind_int64 (22, develop_shotwell.id);
@@ -535,6 +567,15 @@
         res = stmt.bind_text (27, unmarshall_all_transformations (original.original_transforms));
         assert (res == Sqlite.OK);
 
+        res = stmt.bind_int (28, original.gps_coords.has_gps);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (29, original.gps_coords.latitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_double (30, original.gps_coords.longitude);
+        assert (res == Sqlite.OK);
+        res = stmt.bind_text (31, original.location);
+        assert (res == Sqlite.OK);
+
         res = stmt.step ();
         if (res != Sqlite.DONE) {
             if (res != Sqlite.CONSTRAINT)
@@ -550,6 +591,14 @@
         return update_text_by_id (photo_id.id, "title", new_title != null ? new_title : "");
     }
 
+    public void set_gps_coords (PhotoID photo_id, GpsCoords new_gps_coords) throws DatabaseError {
+        update_int_by_id_2 (photo_id.id, "has_gps", new_gps_coords.has_gps);
+        if (new_gps_coords.has_gps > 0) {
+            update_double_by_id_2 (photo_id.id, "gps_lat", new_gps_coords.latitude);
+            update_double_by_id_2 (photo_id.id, "gps_lon", new_gps_coords.longitude);
+        }
+    }
+
     public bool set_comment (PhotoID photo_id, string? new_comment) {
         return update_text_by_id (photo_id.id, "comment", new_comment != null ? new_comment : "");
     }
@@ -720,6 +769,10 @@
         return update_int64_by_id (photo_id.id, "event_id", event_id.id);
     }
 
+    public bool set_location (PhotoID photo_id, string? location) {
+        return update_text_by_id (photo_id.id, "location", location);
+    }
+
     private string? get_raw_transformations (PhotoID photo_id) {
         Sqlite.Statement stmt;
         if (!select_by_id (photo_id.id, "transformations", out stmt))
@@ -848,7 +901,7 @@
         }
 
         return set_raw_transformations (photo_id, trans);
-    }    
+    }
 
     public bool set_original_transforms (PhotoID photo_id, KeyValueMap? map) {
         if (map == null)
@@ -866,7 +919,7 @@
         size_t length;
         string trans = keyfile.to_data (out length);
 
-        return set_raw_original_transforms (photo_id, trans);      
+        return set_raw_original_transforms (photo_id, trans);
     }
 
     public bool remove_transformation (PhotoID photo_id, string object) {
@@ -1020,7 +1073,7 @@
 
     public void set_metadata_dirty (PhotoID photo_id, bool dirty) throws DatabaseError {
         update_int_by_id_2 (photo_id.id, "metadata_dirty", dirty ? 1 : 0);
-    }    
+    }
 
     public bool set_enhanced (PhotoID photo_id, bool enhanced) {
         return update_int_by_id (photo_id.id, "enhanced", enhanced ? 1 : 0);

=== modified file 'src/db/mk/db.mk'
--- src/db/mk/db.mk	2012-04-07 15:38:31 +0000
+++ src/db/mk/db.mk	2014-10-18 00:49:47 +0000
@@ -18,7 +18,8 @@
     TombstoneTable.vala \
     VideoTable.vala \
     VersionTable.vala \
-    SavedSearchDBTable.vala
+    SavedSearchDBTable.vala \
+    GeoLocationTable.vala
 
 # Any unit this unit relies upon (and should be initialized before it's initialized) should
 # be listed here using its Vala namespace.

=== modified file 'src/library/Branch.vala'
--- src/library/Branch.vala	2014-09-25 09:36:24 +0000
+++ src/library/Branch.vala	2014-10-18 00:49:47 +0000
@@ -11,6 +11,10 @@
         get;
         private set;
     }
+    public Library.MapEntry map_entry {
+        get;
+        private set;
+    }
     public Library.VideosEntry videos_entry {
         get;
         private set;
@@ -48,6 +52,7 @@
         RAWS,
         VIDEOS,
         FLAGGED,
+        MAP,
         LAST_IMPORTED,
         IMPORT_QUEUE,
         OFFLINE,
@@ -61,16 +66,23 @@
         photos_entry = new Library.PhotosEntry ();
         videos_entry = new Library.VideosEntry ();
         raws_entry = new Library.RawsEntry ();
+		map_entry = new Library.MapEntry ();
         trash_entry = new Library.TrashSidebarEntry ();
         last_imported_entry = new Library.LastImportSidebarEntry ();
         flagged_entry = new Library.FlaggedSidebarEntry ();
         offline_entry = new Library.OfflineSidebarEntry ();
         import_queue_entry = new Library.ImportQueueSidebarEntry ();
 
+
+		insert (map_entry, EntryPosition.MAP);
         insert (photos_entry, EntryPosition.PHOTOS);
         insert (raws_entry, EntryPosition.RAWS);
         insert (trash_entry, EntryPosition.TRASH);
 
+
+        map_entry.visibility_changed.connect (on_map_visibility_changed);
+        on_map_visibility_changed ();
+
         videos_entry.visibility_changed.connect (on_videos_visibility_changed);
         on_videos_visibility_changed ();
 
@@ -100,6 +112,10 @@
         update_entry_visibility (flagged_entry, EntryPosition.FLAGGED);
     }
 
+    private void on_map_visibility_changed () {
+        update_entry_visibility (map_entry, EntryPosition.MAP);
+    }
+
     private void on_last_imported_visibility_changed () {
         update_entry_visibility (last_imported_entry, EntryPosition.LAST_IMPORTED);
     }
@@ -126,6 +142,68 @@
     }
 }
 
+public class Library.MapEntry : Library.HideablePageEntry {
+    private Icon icon = new ThemedIcon (Resources.MAP_PAGE);
+
+    public MapEntry () {
+        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance ().get_all ())
+            media_sources.gps_contents_altered.connect (on_gps_contents_altered);
+
+        visible = get_has_gps ();
+    }
+
+    ~MapEntry () {
+        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance ().get_all ())
+            media_sources.gps_contents_altered.disconnect (on_gps_contents_altered);
+    }
+
+    public override string get_sidebar_name () {
+        return _ ("Places");
+    }
+