mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dirk Hohndel 2017-08-02 18:53:52 -07:00
commit 2b9523dcff
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mobile-widgets/qml/MapWidget.qml
View file

@ -9,7 +9,7 @@ Item {
Plugin { Plugin {
id: mapPlugin id: mapPlugin
name: "esri" name: "googlemaps"
} }
MapWidgetHelper { MapWidgetHelper {
@ -27,7 +27,7 @@ Item {
plugin: mapPlugin plugin: mapPlugin
zoomLevel: 1 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 var defaultCenter: QtPositioning.coordinate(0, 0)
readonly property real defaultZoomIn: 12.0 readonly property real defaultZoomIn: 12.0
readonly property real defaultZoomOut: 1.0 readonly property real defaultZoomOut: 1.0

2
packaging/windows/mxe-based-build.sh
View file

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

15
scripts/build.sh
View file

@ -429,7 +429,22 @@ else
fi 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 # finally, build Subsurface