Merge branch 'googlemaps' of git://github.com/neolit123/subsurface into googlemaps

mobile-widgets/qml/MapWidget.qml

@@ -9,7 +9,7 @@ Item {
 
 	Plugin {
 		id: mapPlugin
-		name: "esri"
+		name: "googlemaps"
 	}
 
 	MapWidgetHelper {
@@ -27,7 +27,7 @@ Item {
 		plugin: mapPlugin
 		zoomLevel: 1
 
-		readonly property var mapType: { "STREET": supportedMapTypes[0], "SATELLITE": supportedMapTypes[1] }
+		readonly property var mapType: { "STREET": supportedMapTypes[0], "SATELLITE": supportedMapTypes[3] }
 		readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
 		readonly property real defaultZoomIn: 12.0
 		readonly property real defaultZoomOut: 1.0

packaging/windows/mxe-based-build.sh

@@ -273,7 +273,7 @@ do
 	mkdir -p $STAGING_TESTS_DIR/$(basename $d)
 	for f in $d/*
 	do
-		if [[ "$d" =~  geoservice ]] && [[ ! "$f" =~ esri ]] ; then
+		if [[ "$d" =~  geoservice ]] && [[ ! "$f" =~ googlemaps ]] ; then
 			continue
 		fi
 		if [[ "$RELEASE" == "Release" ]] && ([[ ! -f ${f//d.dll/.dll} || "$f" == "${f//d.dll/.dll}" ]]) ; then

scripts/build.sh

@@ -429,7 +429,22 @@ else
 fi
 
 
+# build the googlemaps map plugin
 
+cd $SRC
+if [ ! -d googlemaps ] ; then
+	if [[ $1 = local ]] ; then
+		git clone $SRC/../googlemaps googlemaps
+	else
+		git clone git@github.com:Subsurface-divelog/googlemaps.git
+	fi
+fi
+cd googlemaps
+git checkout master
+git pull --rebase
+qmake
+make -j4
+make install
 
 # finally, build Subsurface