Skip to content
This repository has been archived by the owner on Apr 28, 2022. It is now read-only.

2.0 #25

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open

2.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
933e94a
Clean up ready for version 2.0 and new cordova framework
coomsie Oct 18, 2016
36cd79d
Initial WAB Version
coomsie Oct 18, 2016
67bab0c
Remove files in WWW ready for new WAB version 2.2
coomsie Oct 25, 2016
51fefb3
Added WAB 2.2 WWW Root
Oct 26, 2016
4a8f83c
favicon added
Oct 26, 2016
0ff1cb9
favicon moved to images folder and reference to it in index.html updated
Oct 26, 2016
59742f6
Removed slash from Gallery widget config, reference relative path.
Oct 26, 2016
579352b
changes need to allow WAB to un in cordova project
coomsie Oct 26, 2016
d0d5641
change config.xml to include all plains and features for adobe
coomsie Oct 26, 2016
1119b8b
added plugins to see if adobe works now ...?
coomsie Oct 26, 2016
c85f12a
Rename widget.js to Widget.js
coomsie Oct 26, 2016
6f8792a
Rename widget.js to Widget.js
coomsie Oct 26, 2016
96ea523
Rename widget.js to Widget.js
coomsie Oct 26, 2016
0ba66a2
Rename widget.js to Widget.js
coomsie Oct 26, 2016
c93c648
Rename Widget.js to widget.js
coomsie Oct 26, 2016
5caec95
Rename Widget.js to widget.js
coomsie Oct 26, 2016
ab0531a
Update and rename Widget.js to widget.js
coomsie Oct 26, 2016
c202aaf
Rename Widget.html to widget.html
coomsie Oct 26, 2016
a49e76c
Update and rename Widget.js to widget.js
coomsie Oct 26, 2016
5f5baa6
Update Widget.js
coomsie Oct 26, 2016
7c1605b
Update config.json
coomsie Oct 26, 2016
7c5fbb1
change readme file
coomsie Oct 26, 2016
1c39732
updated to cope with mobile with no protocol
coomsie Oct 27, 2016
650e907
make sure the layer list doesnt show descriptions
coomsie Oct 27, 2016
6d64a67
Update .gitignore
coomsie Oct 28, 2016
66ea9b1
Added Splash and App Icons, Add splash and app icons configs to confi…
coomsie Oct 30, 2016
1ce3061
missed some file locations in config
coomsie Oct 30, 2016
aaba594
stupid xml error
coomsie Oct 30, 2016
86f1058
added social sharing plugin for later ... plus did a quick fix for ad…
coomsie Oct 30, 2016
dfb6557
update basemap name and basemap configs
Oct 30, 2016
3793b70
Default webmap changed. Config changes; label basemap widget, label e…
Oct 30, 2016
ada2a58
MF made an issue come back!
coomsie Oct 31, 2016
67a6d8b
MF FUP
coomsie Oct 31, 2016
4751685
change geometry server to ours
coomsie Oct 31, 2016
2d82798
Update config_Bookmark.json
TheFletcher Nov 1, 2016
703a338
add mobile native sharing
coomsie Nov 1, 2016
ac5dc0a
Updated wrong widget js - initial load incorrect on Native Widget
coomsie Nov 1, 2016
6979c5d
Removed esri Share Widget as will use native one.
coomsie Nov 1, 2016
6567058
Remove esri Share from mobile WAB
coomsie Nov 1, 2016
71afa1f
Change link to mobile link for live
coomsie Nov 1, 2016
cf258ea
remove in app browser from application for now ...
coomsie Nov 1, 2016
734430f
added metadata tag
coomsie Nov 1, 2016
51010e0
added version increase to 2.0.1
coomsie Nov 2, 2016
3076fcf
removed bookmark - not needed
coomsie Nov 3, 2016
457aaf6
added windows platform (Hopefully)
coomsie Nov 3, 2016
9a87d93
try again for windoze
coomsie Nov 3, 2016
53f045a
add windows platform?
coomsie Nov 3, 2016
fd1b6db
author has to be exact for win phone
coomsie Nov 3, 2016
2463f17
add windows app id name for win phone
coomsie Nov 3, 2016
99c7ea8
Update config_Bookmark.json
TheFletcher Nov 8, 2016
6d5660a
Delete thumbnail.png
TheFletcher Nov 8, 2016
0216bc7
Delete thumbnail_1.png
TheFletcher Nov 8, 2016
af0bf08
Delete thumbnail_10.png
TheFletcher Nov 8, 2016
69c4ec0
Delete thumbnail_11.png
TheFletcher Nov 8, 2016
67e7113
Delete thumbnail_12.png
TheFletcher Nov 8, 2016
4d2cd53
Delete thumbnail_13.png
TheFletcher Nov 8, 2016
16f6832
Delete thumbnail_14.png
TheFletcher Nov 8, 2016
6ca465e
Delete thumbnail_15.png
TheFletcher Nov 8, 2016
e0e6e15
Delete thumbnail_16.png
TheFletcher Nov 8, 2016
9e870d8
Delete thumbnail_17.png
TheFletcher Nov 8, 2016
bab52a9
Delete thumbnail_18.png
TheFletcher Nov 8, 2016
59c17c6
Delete thumbnail_19.png
TheFletcher Nov 8, 2016
f83af7f
Delete thumbnail_2.png
TheFletcher Nov 8, 2016
af622e3
Delete thumbnail_20.png
TheFletcher Nov 8, 2016
6fea64e
Delete thumbnail_21.png
TheFletcher Nov 8, 2016
cceffd0
Delete thumbnail_22.png
TheFletcher Nov 8, 2016
9a16d6a
Delete thumbnail_23.png
TheFletcher Nov 8, 2016
a5f3218
Delete thumbnail_3.png
TheFletcher Nov 8, 2016
4e9263b
Delete thumbnail_4.png
TheFletcher Nov 8, 2016
f220e83
Delete thumbnail_5.png
TheFletcher Nov 8, 2016
f2261ed
Delete thumbnail_6.png
TheFletcher Nov 8, 2016
145ff1c
Delete thumbnail_7.png
TheFletcher Nov 8, 2016
3aa9d91
Delete thumbnail_8.png
TheFletcher Nov 8, 2016
559ec62
Delete thumbnail_9.png
TheFletcher Nov 8, 2016
14e0fe9
Bookmark widget added, About link removed, cordova config xml descrip…
Nov 9, 2016
69692b3
App version number 2.0.2
Nov 9, 2016
4c20479
Explore widget added
Nov 9, 2016
fd11392
case sensitive fix
coomsie Nov 9, 2016
9e55352
case sensitive fix
coomsie Nov 9, 2016
7f85954
change to make launch url relative
coomsie Nov 9, 2016
267f570
Add back in in app browser
coomsie Nov 9, 2016
5aa0059
OPen WebApps outside app
coomsie Nov 9, 2016
8937263
Updates for search desc
coomsie Nov 10, 2016
258575b
Updates for search desc
coomsie Nov 10, 2016
a8449d8
update styles for districts and logos
coomsie Nov 10, 2016
27518da
update for logos to come through in districts ...
coomsie Nov 10, 2016
1471217
add class for logo
coomsie Nov 10, 2016
a683010
Version bump 2.0.3
coomsie Nov 10, 2016
2c962d4
Fix for Explore reloading web page when search word applied.
Nov 30, 2016
df9dc11
Https for portalurl, geometry service.
Dec 5, 2016
e0dd619
Updated portal api url and item details url to preview variables
Dec 5, 2016
3ebf84a
Updated portal api url and proxy url
Dec 6, 2016
b097cba
Changed arcgis portal url to http
coomsie Dec 6, 2016
7cd96e1
VERSION BUMP FOR STORES
coomsie Dec 6, 2016
2a48cc3
Speed up api calls
coomsie Dec 7, 2016
b5d574a
spped up api on widget code
coomsie Dec 7, 2016
e5318b6
revert protocol to http for proxy
Dec 9, 2016
a16d78f
Version 2.0.5
Dec 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified .DS_Store
Binary file not shown.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
www/Scripts/3.4compact/*
www/Scripts/3.4compact/*
plugins/*
platforms/*
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
44 changes: 44 additions & 0 deletions android_release_commands.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//////////////////////////////////////////////////////////
////// //////////
////// Remeber to change the version numbers /////////
////// and debug tag etc /////////
/////////////////////////////////////////////////////////

ionic browser add crosswalk

//make sure you are in the cordova directory

cordova build --release android

?

//note
//
///
////keytool -genkey -v -keystore canterburymaps.govt.nz-release-key.keystore -alias canterburymaps.govt.nz -keyalg RSA -keysize 2048 -validity 10000
/////

ONE BUILD
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ./canterburymaps.govt.nz-release-key.keystore ./platforms/android/build/outputs/apk/android-release-unsigned.apk canterburymaps.govt.nz


x86 VERSION
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ./canterburymaps.govt.nz-release-key.keystore ./platforms/android/build/outputs/apk/android-x86-release-unsigned.apk canterburymaps.govt.nz

arm VERSION
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ./canterburymaps.govt.nz-release-key.keystore ./platforms/android/build/outputs/apk/android-armv7-release-unsigned.apk canterburymaps.govt.nz


//then zip

ONE BUILD
/Users/coomsie/Code/android-sdk-mac_x86/build-tools/22.0.1/zipalign -v 4 ./platforms/android/build/outputs/apk/android-release-unsigned.apk ./canterburymaps-2.1.apk



//x86
/Users/coomsie/Code/android-sdk-mac_x86/build-tools/22.0.1/zipalign -v 4 ./platforms/android/build/outputs/apk/android-x86-release-unsigned.apk ./canterburymaps-2.1-x86.apk


//arm version
/Users/coomsie/Code/android-sdk-mac_x86/build-tools/22.0.1/zipalign -v 4 ./platforms/android/build/outputs/apk/android-armv7-release-unsigned.apk ./canterburymaps-2.1-armv7.apk
288 changes: 226 additions & 62 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,93 +1,257 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="nz.govt.canterburymaps" version="1.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="nz.govt.canterburymaps" version="2.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>CanterburyMaps</name>
<description>
Canterbury Maps is a mapping application that allows users to view and manipulate online maps from Canterbury Regional Council and other organisations in the Canterbury Region.
Canterbury Maps is a mapping application allowing you to view and manipulate online maps from the Canterbury Regional Council and other organizations in the Canterbury Region.

The application allows the user to search pre-configured maps, located on the canterburymaps.govt.nz portal, accessed via a mobile device.
This application allows you to access, through your mobile device, pre-configured maps and layers available on canterburymaps.govt.nz.

The mapping application contains the following features
The application offers the following features

for the iPhone / iPad / iPad mini
* Quick search for addresses and locations in Canterbury
* Locate yourself on the map using GPS
* Add and Switch between subject specific maps
* Search and add individual layers to your map
* Map Legend for visible map layers
* Control the display of individual layers
* Switch between a range base map options including historic aerial imagery
* Identify features in the map and get extra detail via info pop-ups
* Share your map with others

* GPS - to locate where you are on the map
* Gallery of pre-configured maps
* Ability to turn mapping layers on/off
* Ability to switch base maps
* Pop-up windows with extra information on the map
* Quick search method for addresses within Canterbury
* Map legend support for the map loaded
* Help pages.

Additional features on iPads and iPad minis:

* Drawing graphics on the map
* Searching for map features on the map
* Identifying features on the map
* Share your map with others
* Measure on the map
* Locate positions on the map with coordinates.

</description>
<author email="[email protected]" href="http://canterburymaps.govt.nz">
CanterburyMaps Team
</author>
<author email="[email protected]" href="http://canterburymaps.govt.nz">Canterbury Regional Council</author>
<content src="index.html" />
<plugin name="cordova-plugin-whitelist" spec="1" />
<access origin="*" />
<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="AllowInlineMediaPlayback" value="false" />
<preference name="BackupWebStorage" value="cloud" />
<preference name="EnableViewportScale" value="true" />
<preference name="KeyboardDisplayRequiresUserAction" value="true" />
<preference name="MediaPlaybackRequiresUserAction" value="false" />
<preference name="SuppressesIncrementalRendering" value="false" />
<preference name="TopActivityIndicator" value="gray" />
<preference name="GapBetweenPages" value="0" />
<preference name="PageLength" value="0" />
<preference name="PaginationBreakingMode" value="page" />
<preference name="PaginationMode" value="unpaginated" />

<preference name="fullscreen" value="true" />
<preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />

<plugin name="cordova-plugin-geolocation" spec="~2.4.0" />
<plugin name="cordova-plugin-splashscreen" spec="~4.0.0" />
<plugin name="cordova-plugin-statusbar" spec="~2.2.0" />
<plugin name="cordova-plugin-dialogs" spec="~1.3.0" />
<plugin name="cordova-plugin-device-motion" spec="~1.2.2" />
<plugin name="cordova-plugin-device" spec="~1.1.3" />
<plugin name="cordova-plugin-device-orientation" spec="~1.0.4" />
<plugin name="cordova-plugin-inappbrowser" spec="~1.5.0" />
<plugin name="cordova-plugin-network-information" spec="~1.3.0" />
<plugin name="cordova-plugin-x-socialsharing" source="npm" />

<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="StatusBarBackgroundColor" value="#000000" />
<preference name="BackupWebStorage" value="local"/>
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar" />
<!-- for iOS -->
<feature name="SocialSharing">
<param name="ios-package" value="SocialSharing" />
</feature>
<!-- for Android (you will find one in res/xml) -->
<feature name="SocialSharing">
<param name="android-package" value="nl.xservices.plugins.SocialSharing" />
</feature>


<feature name="LocalStorage">
<param name="ios-package" value="CDVLocalStorage" />
</feature>
<feature name="Geolocation">
<param name="ios-package" value="CDVLocation" />
<feature name="HandleOpenUrl">
<param name="ios-package" value="CDVHandleOpenURL" />
<param name="onload" value="true" />
</feature>
<feature name="Device">
<param name="ios-package" value="CDVDevice" />
<feature name="IntentAndNavigationFilter">
<param name="ios-package" value="CDVIntentAndNavigationFilter" />
<param name="onload" value="true" />
</feature>
<feature name="Compass">
<param name="ios-package" value="CDVCompass" />
<feature name="GestureHandler">
<param name="ios-package" value="CDVGestureHandler" />
<param name="onload" value="true" />
</feature>
<feature name="Geolocation">
<param name="ios-package" value="CDVLocation" />
</feature>
<feature name="SplashScreen">
<param name="ios-package" value="CDVSplashScreen" />
<param name="onload" value="true" />
</feature>
<feature name="StatusBar">
<param name="ios-package" value="CDVStatusBar" />
<param name="onload" value="true" />
</feature>
<feature name="Notification">
<param name="ios-package" value="CDVNotification" />
</feature>
<feature name="Keyboard">
<param name="ios-package" onload="true" value="CDVKeyboard" />
</feature>

<!-- for android -->

<feature name="Whitelist">
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
<param name="onload" value="true" />
</feature>
<feature name="Geolocation">
<param name="android-package" value="org.apache.cordova.geolocation.Geolocation" />
</feature>
<feature name="SplashScreen">
<param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen" />
<param name="onload" value="true" />
</feature>
<feature name="StatusBar">
<param name="android-package" value="org.apache.cordova.statusbar.StatusBar" />
<param name="onload" value="true" />
</feature>
<feature name="Notification">
<param name="android-package" value="org.apache.cordova.dialogs.Notification" />
</feature>
<feature name="Keyboard">
<param name="android-package" onload="true" value="org.apache.cordova.labs.keyboard.Keyboard" />
</feature>

<!-- for windows phone -->
<feature name="Device">
<param name="wp-package" value="Device" onload="true"/>
</feature>
<feature name="Compass">
<param name="wp-package" value="Compass" />
</feature>
<feature name="Accelerometer">
<param name="ios-package" value="CDVAccelerometer" />
<param name="wp-package" value="Accelerometer"/>
</feature>
<feature name="Console">
<param name="ios-package" value="CDVLogger" />
<feature name="Geolocation">
<param name="wp-package" value="Geolocation" onload="true"/>
</feature>
<feature name="NetworkStatus">
<param name="ios-package" value="CDVConnection" />
<feature name="Notification">
<param name="wp-package" value="Notification"/>
</feature>


<preference name="AllowInlineMediaPlayback" value="false" />
<preference name="BackupWebStorage" value="none" />
<preference name="EnableViewportScale" value="true" />
<preference name="KeyboardDisplayRequiresUserAction" value="true" />
<preference name="MediaPlaybackRequiresUserAction" value="false" />
<preference name="SuppressesIncrementalRendering" value="false" />
<preference name="TopActivityIndicator" value="gray" />
<preference name="GapBetweenPages" value="0" />
<preference name="PageLength" value="0" />
<preference name="PaginationBreakingMode" value="page" />
<preference name="PaginationMode" value="unpaginated" />

<preference name="BackupWebStorage" value="local" />
<preference name="iosPersistentFileLocation" value="Compatibility" />

<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />


<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="StatusBarBackgroundColor" value="#004f9f" />
<preference name="StatusBarStyle" value="lightcontent" />

<preference name="ShowSplashScreenSpinner" value="false"/>
<preference name="AutoHideSplashScreen" value="true" />
<preference name="SplashScreenDelay" value="3000" />
<!-- ios quirks -->
<preference name="FadeSplashScreen" value="false"/>
<!-- android quirks -->
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="SplashShowOnlyFirstTime" value="false" />

<platform name="ios">
<!-- App Icon -->

<!-- iPhone 6 / 6+ -->
<icon src="res/icon/ios/[email protected]" platform="ios" width="180" height="180" />

<!-- iPhone / iPod Touch -->
<icon src="res/icon/ios/icon-60.png" platform="ios" width="60" height="60" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="120" height="120" />

<!-- iPad -->
<icon src="res/icon/ios/icon-76.png" platform="ios" width="76" height="76" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="152" height="152" />

<!-- Settings Icon -->
<icon src="res/icon/ios/icon-small.png" platform="ios" width="29" height="29" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="58" height="58" />

<!-- Spotlight Icon -->
<icon src="res/icon/ios/icon-40.png" platform="ios" width="40" height="40" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="80" height="80" />

<!-- iPhone / iPod Touch -->
<icon src="res/icon/ios/icon.png" platform="ios" width="57" height="57" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="114" height="114" />

<!-- iPad -->
<icon src="res/icon/ios/icon-72.png" platform="ios" width="72" height="72" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="144" height="144" />

<!-- iPhone Spotlight and Settings Icon -->
<icon src="res/icon/ios/icon-small.png" platform="ios" width="29" height="29" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="58" height="58" />

<!-- iPad Spotlight and Settings Icon -->
<icon src="res/icon/ios/icon-50.png" platform="ios" width="50" height="50" />
<icon src="res/icon/ios/[email protected]" platform="ios" width="100" height="100" />

<!-- Launch images.-->
<splash src="res/screen/ios/Default~iphone.png" width="320" height="480"/>
<splash src="res/screen/ios/Default@2x~iphone.png" width="640" height="960"/>
<splash src="res/screen/ios/Default-Portrait~ipad.png" width="768" height="1024"/>
<splash src="res/screen/ios/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
<splash src="res/screen/ios/Default-Landscape~ipad.png" width="1024" height="768"/>
<splash src="res/screen/ios/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
<splash src="res/screen/ios/Default-568h@2x~iphone.png" width="640" height="1136"/>
<splash src="res/screen/ios/Default-Landscape-736h.png" width="2208" height="1242"/>
<splash src="res/screen/ios/Default-667h.png" width="750" height="1334"/>
<splash src="res/screen/ios/Default-736h.png" width="1242" height="2208"/>
</platform>

<platform name="android">
<!-- app icons -->

<icon src="res/icon/android/ldpi.png" platform="android" qualifier="ldpi" />
<icon src="res/icon/android/mdpi.png" platform="android" qualifier="mdpi" />
<icon src="res/icon/android/hdpi.png" platform="android" qualifier="hdpi" />
<icon src="res/icon/android/xhdpi.png" platform="android" qualifier="xhdpi" />
<icon src="res/icon/android/xxhdpi.png" platform="android" qualifier="xxhdpi" />
<icon src="res/icon/android/fr-xxhdpi.png" platform="android" qualifier="fr-xxhdpi" />

<!-- you can use any density that exists in the Android project -->
<splash src="res/screen/android/splash-land-hdpi.png" density="land-hdpi"/>
<splash src="res/screen/android/splash-land-ldpi.png" density="land-ldpi"/>
<splash src="res/screen/android/splash-land-mdpi.png" density="land-mdpi"/>
<splash src="res/screen/android/splash-land-xhdpi.png" density="land-xhdpi"/>

<splash src="res/screen/android/splash-port-hdpi.png" density="port-hdpi"/>
<splash src="res/screen/android/splash-port-ldpi.png" density="port-ldpi"/>
<splash src="res/screen/android/splash-port-mdpi.png" density="port-mdpi"/>
<splash src="res/screen/android/splash-port-xhdpi.png" density="port-xhdpi"/>
</platform>

<!-- TRY NATIVE SOCIAL SHARING -->
<plugin name="cordova-plugin-x-socialsharing" source="npm" />
<!-- for iOS -->
<feature name="SocialSharing">
<param name="ios-package" value="SocialSharing" />
</feature>

<!-- for Android (you will find one in res/xml) -->
<feature name="SocialSharing">
<param name="android-package" value="nl.xservices.plugins.SocialSharing" />
</feature>



<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="tel:*" />
<allow-intent href="sms:*" />
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<platform name="android">
<allow-intent href="market:*" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
</platform>
<platform name="winphone" />
<platform name="windows" />
<preference name="windows-identity-name" value="CanterburyRegionalCouncil.CanterburyMaps" />
</widget>
Loading