Merge pull request #63 from kort/develop

Release 2.2.x

.gitignore

@@ -15,7 +15,6 @@ build/production/Kort/server/php/Webservice/Database/DbConfig.php
 build/archive/
 build/temp/
 *.bak
-.idea/
 docs/Kort
 docs/Kort-backend
 docs/Ext.ux.LeafletMap
@@ -25,6 +24,8 @@ npm-debug.log
 vendor/
 bin/
 .sencha_backup/      
-.idea/
+.idea/workspace.xml
+.idea/kort.iml
 /Icon
 data/
+.idea/watcherTasks.xml

.travis.yml

@@ -19,7 +19,7 @@ before_install:
   - gem install sass
   - gem install compass
   - gem install jsduck
-  - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh >/dev/null 2>&1
+  - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
   - npm install -g grunt-cli
   - npm install 
   - curl -s http://getcomposer.org/installer | php --

README.md

@@ -2,6 +2,8 @@
 
 Kort is a cross-platform, crowdsourcing app aimed to improve OpenStreetMap.
 
+[![Stories in Ready](https://badge.waffle.io/kort/kort.png?label=ready&title=Ready)](http://waffle.io/kort/kort)
+
 ## Build
 
 Kort is built using [Travis CI](https://travis-ci.org):

app.js

@@ -140,13 +140,22 @@ Ext.application({
 
     statusBarStyle: 'black',
 
-    icon: './resources/images/kort-icon.png',
+    icon: {
+        57: './resources/images/kort-icon-57.png',
+        72: './resources/images/kort-icon-72.png',
+        114: './resources/images/kort-icon-114.png',
+        144: './resources/images/kort-icon-144.png'
+    },
+
+    isIconPrecomposed: true,
 
     startupImage: {
-        // Non-retina iPhone, iPod touch, and all Android devices
-        '320x460': './resources/images/kort-startup-alldev-320x460.png',
-        // Retina iPhone and iPod touch
-        '640x920': './resources/images/kort-startup-alldev-640x920.png'
+        '320x460': './resources/images/kort-startup-320x460.png',
+        '640x920': './resources/images/kort-startup-640x920.png',
+        '768x1004': './resources/images/kort-startup-768x1004.png',
+        '748x1024': './resources/images/kort-startup-748x1024.png',
+        '1536x2008': './resources/images/kort-startup-1536x2008.png',
+        '1496x2048': './resources/images/kort-startup-1496x2048.png'
     },
 
     // launch function is called as soon as app is ready

app/util/Config.js

@@ -8,7 +8,7 @@ Ext.define('Kort.util.Config', {
         /**
          * @cfg {String} version Current version number of application
          */
-        version: '2.1.{BUILD_NR}',
+        version: '2.2.{BUILD_NR}',
 
         /**
          * @cfg {String[]} supportedLanguages Supported languages of the app
@@ -31,11 +31,10 @@ Ext.define('Kort.util.Config', {
          */
 		leafletMap: {
             zoom: 15,
-			tileLayerUrl: 'http://{s}.tile.cloudmade.com/{apiKey}/{styleId}/256/{z}/{x}/{y}.png',
-            retinaTileLayerUrl: 'http://{s}.tile.cloudmade.com/{apiKey}/{styleId}@2x/256/{z}/{x}/{y}.png',
-            tileLayerAttribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a>',
-			apiKey: '729242682cb24de8aa825c8aed993cba',
-            styleId: 997
+            tileLayerUrl: 'http://{s}.tiles.lyrk.org/ls/{z}/{x}/{y}?apikey={apiKey}',
+            retinaTileLayerUrl: 'http://{s}.tiles.lyrk.org/lr/{z}/{x}/{y}?apikey={apiKey}',
+            tileLayerAttribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> | Tiles by <a href="http://geodienste.lyrk.de/" target="_blank">Lyrk</a>',
+            apiKey: '079ab13252d244d0a153d652489ad110'
 		},
 
         /**
@@ -71,8 +70,6 @@ Ext.define('Kort.util.Config', {
                 redirect_path: 'server/oauth2callback/facebook',
                 response_type: 'code',
                 client_id: '290615117735384'
-
-
             }
         },
 
@@ -136,7 +133,7 @@ Ext.define('Kort.util.Config', {
             credits: {
                 partner: '<a href="http://bitforge.ch" target="_blank">bitforge AG</a>',
                 mapdata: '<a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap-Mitwirkende</a> (ODbL)',
-                tiledata: '<a href="http://cloudmade.com" target="_blank">CloudMade</a> (CC-BY-SA)',
+                tiledata: '<a href="http://geodienste.lyrk.de/" target="_blank">Lyrk</a> (<a href="https://geodienste.lyrk.de/copyright" target="_blank">Copyright</a>)',
                 markers: '<a href="http://mapicons.nicolasmollet.com" target="_blank">mapicons collection</a>',
                 translation: '<a href="https://www.transifex.com/projects/p/kort/" target="_blank">Transifex</a>',
                 dbhosting: '<a href="http://www.sourcepole.ch" target="_blank">sourcepole</a>'

app/view/LeafletMap.js

@@ -16,9 +16,7 @@ Ext.define('Kort.view.LeafletMap', {
         retinaTileLayerUrl: Kort.util.Config.getLeafletMap().retinaTileLayerUrl,
         tileLayerOptions: {
             apiKey: Kort.util.Config.getLeafletMap().apiKey,
-            styleId: Kort.util.Config.getLeafletMap().styleId,
-            attribution: Kort.util.Config.getLeafletMap().tileLayerAttribution,
-            detectRetina: true
+            attribution: Kort.util.Config.getLeafletMap().tileLayerAttribution
         }
     }
 });

app/view/about/Container.js

@@ -50,7 +50,7 @@ Ext.define('Kort.view.about.Container', {
                                 '<dd>' + Ext.i18n.Bundle.message('about.credits.markers') + ' ' + Kort.util.Config.getAbout().credits.markers + '</dd>' +
                                 '<dd>' + Ext.i18n.Bundle.message('about.credits.translation') + ' ' + Kort.util.Config.getAbout().credits.translation + '</dd>' +
                                 '<dd>' + Ext.i18n.Bundle.message('about.credits.dbhosting') + ' ' + Kort.util.Config.getAbout().credits.dbhosting + '</dd>' +
-                                '<dd class="image-sourcepole-logo"><a href="http://www.sourcepole.ch" target="_blank"><img src="resources/images/logo_sourcepole.png" /></a></dd>' +
+                                '<dd class="image-logo-sourcepole"><a href="http://www.sourcepole.ch" target="_blank"><img src="resources/images/logo_sourcepole.png" /></a></dd>' +
                                 '<dt>' + Ext.i18n.Bundle.message('about.legal.title') + '</dt>' +
                                 '<dd>' + Ext.i18n.Bundle.message('about.legal.message') + '</dd>' +
                             '</dl>' +

bootstrap.js

@@ -22,7 +22,7 @@ Ext.Loader.addClassPathMappings({
   "Ext.ux.LeafletMap": "ux/LeafletMap.js",
   "Kort": "app",
   "patch": "patch"
-});
+});
 Ext.ClassManager.addNameAlternateMappings({
   "Ext.AbstractComponent": [],
   "Ext.AbstractManager": [],
@@ -208,7 +208,6 @@ Ext.ClassManager.addNameAlternateMappings({
   "Ext.data.identifier.Sequential": [],
   "Ext.data.identifier.Simple": [],
   "Ext.data.identifier.Uuid": [],
-  "Ext.data.plugin.Buffered": [],
   "Ext.data.proxy.Ajax": [
     "Ext.data.HttpProxy",
     "Ext.data.AjaxProxy"
@@ -833,7 +832,7 @@ Ext.ClassManager.addNameAlternateMappings({
   "Kort.view.profile.Container": [],
   "Kort.view.profile.ContentComponent": [],
   "patch.AjaxProxy": []
-});
+});
 Ext.ClassManager.addNameAliasMappings({
   "Ext.AbstractComponent": [],
   "Ext.AbstractManager": [],
@@ -1142,9 +1141,6 @@ Ext.ClassManager.addNameAliasMappings({
   "Ext.data.identifier.Uuid": [
     "data.identifier.uuid"
   ],
-  "Ext.data.plugin.Buffered": [
-    "plugin.storebuffered"
-  ],
   "Ext.data.proxy.Ajax": [
     "proxy.ajax"
   ],
@@ -1934,4 +1930,4 @@ Ext.ClassManager.addNameAliasMappings({
     "widget.profilecontentcomponent"
   ],
   "patch.AjaxProxy": []
-});
+});

build/production/Kort/app.json

@@ -1 +1 @@
-{"id":"fbb39b29-532a-449b-bc50-7d1890386993","js":[{"path":"lib/Leaflet-0.7/dist/leaflet-src.js","update":"full","version":"992aebdbde5f1bb948b41f21c1f054ce1c761db5"},{"path":"lib/Leaflet-0.7/dist/leaflet-osm.js","update":"full","version":"d9ab50208bec2be25a66e7b3f42605c6b8b7d9de"},{"path":"lib/kort-libs/UrlLib.js","update":"full","version":"7245360786bdfec03e30233cc8accfc37928bb05"},{"path":"lib/kort-libs/Math.js","update":"full","version":"93c2817bc961eb43ffcfdedd274e8db34b4cd0a7"},{"path":"app.js","update":"full","version":"629e41766a4629c927dfdacc22f0254590f0d606"}],"css":[{"path":"resources/css/app.css","version":"f5e62730663b5e3a42850703affb149c4d7efc8e"},{"path":"lib/Leaflet-0.7/dist/leaflet.css","version":"15b9d26a893e443066030eafb5a32e4ecec23bea"},{"path":"lib/zocial/css/zocial.css","version":"63edb4835dbbf68cb68eb11478b23c8f77a799be"},{"path":"resources/styles/styles.css","version":"061d62dc77eac07e46765d7e6e0e691fcc2962a1"}]}
+{"id":"fbb39b29-532a-449b-bc50-7d1890386993","js":[{"path":"lib/Leaflet-0.7/dist/leaflet-src.js","update":"full","version":"7ef58f80c266ba1490a9b3842144ffc4eec0159b"},{"path":"lib/Leaflet-0.7/dist/leaflet-osm.js","update":"full","version":"b7f087d29c674d9ce6bfd0f2b7f4028cbe40a956"},{"path":"lib/kort-libs/UrlLib.js","update":"full","version":"06d2ac778cdcedd3ec5558f68773d60cc37d5dd1"},{"path":"lib/kort-libs/Math.js","update":"full","version":"93c2817bc961eb43ffcfdedd274e8db34b4cd0a7"},{"path":"app.js","update":"full","version":"635f8bad2cd74e58e092db5914453a4b24a63465"}],"css":[{"path":"resources/css/app.css","version":"962a54750905895f964db92b3fbe2da6a2677cbb"},{"path":"lib/Leaflet-0.7/dist/leaflet.css","version":"15b9d26a893e443066030eafb5a32e4ecec23bea"},{"path":"lib/zocial/css/zocial.css","version":"63edb4835dbbf68cb68eb11478b23c8f77a799be"},{"path":"resources/styles/styles.css","version":"2f76ee91a2b182fe4c862ac0dfcc06673548816b"}]}

build/production/Kort/cache.appcache

@@ -1,75 +1,73 @@
 CACHE MANIFEST
-# c7bf70c19a60824248c32bba0265de208e652e09
+# 6d630cfe835d43421fdbf8c409a0037a303690d4
 index.html
-# 2145bfd88f8aa885be336ade8a6928d90c0045a7
-resources/images/ajax-loader.gif
-# 98836e42520b89367263ea701005ffa3725abcd8
+# 286e9193e72ee20a4cc29ab483b9734c1f397a92
 resources/images/arrow_black.png
-# 1ed05dd1938d025c8114e6018b5289ec8cf7a5d0
+# 02d87c52383f407634f1fc0325d823a261884a60
 resources/images/hsr_logo.png
-# d862fa6f5facd26f723a0b37b97f2d4f6b10c556
+# 6a60c197c4e6e72435fc1ae5629f3ff8d518e76d
 resources/images/kort-favicon.ico
-# b6e606a7721417a892eddc84a7be189b6b40082b
+# 0f150890ce254ef53a1830388e28122fed59d418
 resources/images/kort-icon.png
-# 94b8ade5c5d5da4f1faaf28a755d0dff4d69412e
+# eb28a0dd58a8417d352486dd375fd1b20d02cc30
 resources/images/kort-logo.png
-# a25f9d47a10ebfb260aa8b39fa8ec97bce03a580
+# 1f2eb403185a1afe9e91f6efcdcae908213c3485
 resources/images/kort-logo_white.png
-# 1fd4f41d01095658e0ad2b09aae392cf5e978474
+# ba6a37b71e896967b771053e22cafc35172b890a
 resources/images/listStarIcon.png
-# c66dd71dfcd0b3e9e1b9412b56a995bc28a838f8
+# 371e5a8022e3596ef9eebab8f41291353232b129
 resources/images/listStarIcon@X2.png
-# f83095820e5f5a6c525bf628c585cac1e744d22f
+# 4ef55ed3aea14f2fd5f81efaf241d030061b87bf
 resources/images/logo_sourcepole.png
-# 4d57f703e70b0ed6f56376cab1a205aa245c5bf8
+# c623a1fa372ed562dd084bb6ed78564a99441d1c
 resources/images/transparent_loader.gif
-# 84aea6bed80a422b5fea8903f5af888cd3e85f10
+# 9660f88a6f9d4ed8b981af7f773d6524713d08cf
 resources/images/badges/fix_count_1.png
-# e404710ad40a1da431da5e4f9eae19588c7d9052
+# 903e7b35f9df3acbe6442243b3ed4175ee1d940e
 resources/images/badges/fix_count_10.png
-# 9d7b7a806f4b38f4b57541e3a3a958dec044de0e
+# d4bd6bce155b510ab392570a610acba7044abd16
 resources/images/badges/fix_count_50.png
-# 00acf444fdc97aa0c9cc6de2cec0b7e68a1513a0
+# 12fe2828d87e039310c59ddf1c6d376ebba14821
 resources/images/badges/fix_count_100.png
-# 7ea6732c1f8a8bf0c9de10e5f8b26a5e9fb7d814
+# baff9b19b68e073db89c81554820b89cce6bd207
 resources/images/badges/highscore_place_1.png
-# 5cb49201f378433153cdc6544c180640b57ee413
+# a0ecace8bf4d899cb0c9522ad59ffd7a53573b8b
 resources/images/badges/highscore_place_2.png
-# 0281c776d9378a99ee206be7a6f79e6199102115
+# 80f2a8cd2f5e409fdcc21dda8f27b4d275d10851
 resources/images/badges/highscore_place_3.png
-# 605bedf34467cfbf38e4daca1cfc818dab724a0a
+# beed126a137562e10bbd092b15c0673055c32136
 resources/images/badges/locked.png
-# 34041c635ec449bf3d8c001c4073c355d8da54fe
+# 21c004d5470e8e5011711f5357a91f5725d2c477
 resources/images/badges/vote_count_1.png
-# 8a735d94dc77c60c0478c81f27b492f8e57e211d
+# a7ee693b03fe8ded5baedf420f58587bfd6c2c61
 resources/images/badges/vote_count_10.png
-# d613cb6a65819db3da2abed4f5dd4f16aaa6a7d0
+# 4b64626bd2c67b86b67f869fb41d1ab7287988dc
 resources/images/badges/vote_count_100.png
-# c8f6328e6156964f107bc49f51420eb087c3db0e
+# 67c93bb755224c49331d1d6679cf12dee71baa7c
 resources/images/badges/vote_count_1000.png
-# c15a0ddd2d5f7afebcb6322d13c69cfd3a5f4339
+# e3643e6d9bfcc9e60ebafb704bccec1476cbe9e6
 resources/images/koins/koin_no_value.png
-# 39ae2834ae78901e3cf6e56c1c67629e8c4b5281
+# 13b96173f114976a840e525ae5b373fddcced880
 resources/images/marker_icons/language_unknown_mission.png
-# 0285f7aac7b7897838684228872611f0f18ca7fa
+# 062597c700571247b81134acc2e3176ec6f93d13
 resources/images/marker_icons/language_unknown_mission@2x.png
-# 8cf2a9864903483ec5d5fe6b121bcb8919295a02
+# f148c3ee4bd3aedd8fb6de47d77115b69219bbfc
 resources/images/marker_icons/shadow.png
-# 98555d5e2404d3e41c4fa424b0ffbad942f442af
+# 033ca7c72c58099a622e804475bdbc8260ff6781
 resources/images/marker_icons/shadow@2x.png
-# 89514b38350ac1ad7f1b77c3d0a7a42a65b5590b
+# cd3971f5132b7a90dcd8d33fd6fd993dd162b5b6
 resources/images/profile/highscore.png
-# e8273fe80aba4da8317d30601d0431ed527c31bd
+# 704881b3a0d2a605232d7829a43e1b614b1b7821
 resources/images/promotion/promotionCircle.png
-# 8c1e2ef29ebcc516b6f3d4b21a0b1466daf18183
+# 0a0fb6dfc9b893c3f47e7e54fb5a25e8bf1820a8
 resources/images/promotion/promotionCircle@2X.png
-# 2336e6ca6fc033dd73c9bbd98d2a8a51010c1263
+# 1055a8f1f5eb45bfeb78c6dbe8b6b1a0accdedd5
 resources/images/promotion/promotionInfoButton@X2.png
-# 419bb2056c7012932187390094907a51093fe2c1
+# d2ecdc77edfdfec7c96988ca3c8a44647a608df7
 resources/images/validation/thumbs-down.png
-# 91c3b924bc761d5e3c714fc1f98c933cec0c4990
+# f0bf2ddb7f2732bdf54442743f63e3072ebc53ad
 resources/images/validation/thumbs-up.png
-# 39b6b0fbf895c7544fc137bd970d7b4d4c771915
+# b0d30aae03f95e97c1584b98b4477b59a113bba2
 resources/images/validation/votes-left.png