Merge branch 'development' of https://github.com/TNOCS/csWeb into dev…

…elopment
TNOCS · Oct 30, 2015 · 17a9511 · 17a9511
2 parents 7bc8ea7 + 3aef334
commit 17a9511
Show file tree

Hide file tree

Showing 372 changed files with 69,697 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,6 @@ csDataGatherer/node_modules/
 csDataGatherer/public/includes/
 csDataGatherer/Scripts/
 csDataGatherer/importers.json
-
 node_modules/
 
 example/node_modules/
@@ -56,3 +55,4 @@ csServerComp/Classes/Feature.js
 example/public/data/
 example/.settings/
 csComp/includes/css/csStyles.css
+example/.vscode/
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "csWeb",
     "version": "0.1.1",
-    "main": "dist/csComp/csComp.js",
+    "main": "dist-bower/csComp.js",
     "ignore": [
         "csComp",
         "csServerComp",
@@ -12,6 +12,7 @@
         "gulp.js",
         "Dockerfile",
         "package.json",
+        "dist",
         "README.md",
         ".bithoundrc",
         ".editorconfig",

diff --git a/csComp/directives/LayersList/LayersDirectiveCtrl.ts b/csComp/directives/LayersList/LayersDirectiveCtrl.ts
@@ -329,7 +329,7 @@ module LayersDirective {
                         this.newLayer.typeUrl = this.layerResourceType;
                     }
 
-                    var l = { id: nl.title, title: nl.title, isDynamic: true, type: nl.type, description: nl.description, typeUrl: nl.typeUrl, tags: nl.tags, url: nl.url };
+                    var l = { id: nl.title, title: nl.title, isDynamic: true, type: nl.type, storage : 'file', description: nl.description, typeUrl: nl.typeUrl, tags: nl.tags, url: nl.url };
                     this.$http.post("/api/layers", l)
                         .success((data) => {
                         console.log(data);
@@ -358,7 +358,7 @@ module LayersDirective {
             //layer.enabled = !layer.enabled;
             //if (this.$layerService.loadedLayers.containsKey(layer.id)) {
             // Unselect when dealing with a radio group, so you can turn a loaded layer off again.
-            this.$layerService.toggleLayer(layer);            
+            this.$layerService.toggleLayer(layer);
 
             // NOTE EV: You need to call apply only when an event is received outside the angular scope.
             // However, make sure you are not calling this inside an angular apply cycle, as it will generate an error.

diff --git a/csServerComp/tsconfig.json b/csServerComp/tsconfig.json
@@ -18,104 +18,105 @@
         "!./Classes/*.d.ts"
     ],
     "files": [
-        "./Classes/Feature.ts",
-        "./Scripts/typings/async/async.d.ts",
-        "./Scripts/typings/bcrypt/bcryptjs.d.ts",
-        "./Scripts/typings/body-parser/body-parser.d.ts",
-        "./Scripts/typings/cors/cors.d.ts",
-        "./Scripts/typings/cs/cs-offline-search.d.ts",
-        "./Scripts/typings/express/express.d.ts",
-        "./Scripts/typings/form-data/form-data.d.ts",
-        "./Scripts/typings/fs-extra/fs-extra.d.ts",
-        "./Scripts/typings/hypertimer/hypertimer.d.ts",
-        "./Scripts/typings/jquery/jquery.d.ts",
-        "./Scripts/typings/JSONStream/JSONStream.d.ts",
-        "./Scripts/typings/jwt-simple/jwt-simple.d.ts",
-        "./Scripts/typings/mongodb/mongodb.d.ts",
-        "./Scripts/typings/mqtt/mqtt-router.d.ts",
-        "./Scripts/typings/mqtt/mqtt.d.ts",
-        "./Scripts/typings/node/node.d.ts",
-        "./Scripts/typings/pg/pg.d.ts",
-        "./Scripts/typings/proj4/proj4.d.ts",
-        "./Scripts/typings/request/request.d.ts",
-        "./Scripts/typings/socketio/socket.io.d.ts",
-        "./Scripts/typings/sqlite3/sqlite3.d.ts",
-        "./Scripts/typings/underscore/underscore.d.ts",
-        "./Scripts/typings/winston/winston.d.ts",
-        "./Scripts/typings/xml2js/xml2js.d.ts",
-        "./ServerComponents/api/ApiManager.ts",
-        "./ServerComponents/api/ApiServiceManager.ts",
-        "./ServerComponents/api/AuthAPI.ts",
-        "./ServerComponents/api/BaseConnector.ts",
-        "./ServerComponents/api/config.ts",
-        "./ServerComponents/api/FileStorage.ts",
-        "./ServerComponents/api/IApiService.ts",
-        "./ServerComponents/api/IApiServiceManager.ts",
-        "./ServerComponents/api/imb.ts",
-        "./ServerComponents/api/ImbAPI.ts",
-        "./ServerComponents/api/MongoDB.ts",
-        "./ServerComponents/api/MqttAPI.ts",
-        "./ServerComponents/api/qlobber.ts",
-        "./ServerComponents/api/RestAPI.ts",
-        "./ServerComponents/api/SocketIOAPI.ts",
-        "./ServerComponents/bus/MessageBus.ts",
-        "./ServerComponents/configuration/ConfigurationService.ts",
-        "./ServerComponents/configuration/IConfiguration.ts",
-        "./ServerComponents/creator/AccessibilityService.ts",
-        "./ServerComponents/creator/IGeoJsonFeature.ts",
-        "./ServerComponents/creator/IProjectRepositoryService.ts",
-        "./ServerComponents/creator/MapLayerFactory.ts",
-        "./ServerComponents/creator/ProjectRepositoryService.ts",
-        "./ServerComponents/creator/ProxyService.ts",
-        "./ServerComponents/creator/RssService.ts",
-        "./ServerComponents/database/BagDatabase.ts",
-        "./ServerComponents/database/IBagAddress.ts",
-        "./ServerComponents/database/IBagOptions.ts",
-        "./ServerComponents/database/LocalBag.ts",
-        "./ServerComponents/database/Location.ts",
-        "./ServerComponents/dynamic/ClientConnection.ts",
-        "./ServerComponents/dynamic/DataSource.ts",
-        "./ServerComponents/dynamic/DynamicLayer.ts",
-        "./ServerComponents/dynamic/DynamicProject.ts",
-        "./ServerComponents/dynamic/LayerDirectory.ts",
-        "./ServerComponents/helpers/conrec.ts",
-        "./ServerComponents/helpers/DateUtils.ts",
-        "./ServerComponents/helpers/GeoJSON.ts",
-        "./ServerComponents/helpers/Rss.ts",
-        "./ServerComponents/helpers/RssGeoJSON.ts",
-        "./ServerComponents/helpers/StringExt.ts",
-        "./ServerComponents/helpers/typestate.ts",
-        "./ServerComponents/helpers/Utils.ts",
-        "./ServerComponents/import/AggregateOpportunitiesToGeoJsonTransformer.ts",
-        "./ServerComponents/import/AggregateOpportunitiesToOrganisationTransformer.ts",
-        "./ServerComponents/import/BagDetailsTransformer.ts",
-        "./ServerComponents/import/BaseTransformer.ts",
-        "./ServerComponents/import/BushalteAggregateTransformer.ts",
-        "./ServerComponents/import/CliImporter.ts",
-        "./ServerComponents/import/CollateStreamTransformer.ts",
-        "./ServerComponents/import/CsvSaveTransformer.ts",
-        "./ServerComponents/import/CsvToJsonTransformer.ts",
-        "./ServerComponents/import/FieldFilterTransformer.ts",
-        "./ServerComponents/import/FieldSplitTransformer.ts",
-        "./ServerComponents/import/GeoJsonAggregateTransformer.ts",
-        "./ServerComponents/import/GeoJsonFeaturesTransformer.ts",
-        "./ServerComponents/import/GeoJsonOutputTransformer.ts",
-        "./ServerComponents/import/GeoJsonSaveTransformer.ts",
-        "./ServerComponents/import/GeoJsonSplitTransformer.ts",
-        "./ServerComponents/import/IImport.ts",
-        "./ServerComponents/import/IImporterRepositoryService.ts",
-        "./ServerComponents/import/Importer.ts",
-        "./ServerComponents/import/ImporterRepositoryService.ts",
-        "./ServerComponents/import/IsoLines.ts",
-        "./ServerComponents/import/IStore.ts",
-        "./ServerComponents/import/ITransform.ts",
-        "./ServerComponents/import/KvKToJsonTransformer.ts",
-        "./ServerComponents/import/MergeGeoJsonTransformer.ts",
-        "./ServerComponents/import/RepeatEnum.ts",
-        "./ServerComponents/import/SplitAdresTransformer.ts",
-        "./ServerComponents/import/Store.ts",
-        "./ServerComponents/rules/Rule.ts",
-        "./ServerComponents/rules/RuleEngine.ts",
-        "./ServerComponents/rules/WorldState.ts"
-    ]
+        "Classes/Feature.ts",
+        "Scripts/typings/async/async.d.ts",
+        "Scripts/typings/bcrypt/bcryptjs.d.ts",
+        "Scripts/typings/body-parser/body-parser.d.ts",
+        "Scripts/typings/cors/cors.d.ts",
+        "Scripts/typings/cs/cs-offline-search.d.ts",
+        "Scripts/typings/express/express.d.ts",
+        "Scripts/typings/form-data/form-data.d.ts",
+        "Scripts/typings/fs-extra/fs-extra.d.ts",
+        "Scripts/typings/hypertimer/hypertimer.d.ts",
+        "Scripts/typings/jquery/jquery.d.ts",
+        "Scripts/typings/JSONStream/JSONStream.d.ts",
+        "Scripts/typings/jwt-simple/jwt-simple.d.ts",
+        "Scripts/typings/mongodb/mongodb.d.ts",
+        "Scripts/typings/mqtt/mqtt-router.d.ts",
+        "Scripts/typings/mqtt/mqtt.d.ts",
+        "Scripts/typings/node/node.d.ts",
+        "Scripts/typings/pg/pg.d.ts",
+        "Scripts/typings/proj4/proj4.d.ts",
+        "Scripts/typings/request/request.d.ts",
+        "Scripts/typings/socketio/socket.io.d.ts",
+        "Scripts/typings/sqlite3/sqlite3.d.ts",
+        "Scripts/typings/underscore/underscore.d.ts",
+        "Scripts/typings/winston/winston.d.ts",
+        "Scripts/typings/xml2js/xml2js.d.ts",
+        "ServerComponents/api/ApiManager.ts",
+        "ServerComponents/api/ApiServiceManager.ts",
+        "ServerComponents/api/AuthAPI.ts",
+        "ServerComponents/api/BaseConnector.ts",
+        "ServerComponents/api/config.ts",
+        "ServerComponents/api/FileStorage.ts",
+        "ServerComponents/api/IApiService.ts",
+        "ServerComponents/api/IApiServiceManager.ts",
+        "ServerComponents/api/imb.ts",
+        "ServerComponents/api/ImbAPI.ts",
+        "ServerComponents/api/MongoDB.ts",
+        "ServerComponents/api/MqttAPI.ts",
+        "ServerComponents/api/qlobber.ts",
+        "ServerComponents/api/RestAPI.ts",
+        "ServerComponents/api/SocketIOAPI.ts",
+        "ServerComponents/bus/MessageBus.ts",
+        "ServerComponents/configuration/ConfigurationService.ts",
+        "ServerComponents/configuration/IConfiguration.ts",
+        "ServerComponents/creator/AccessibilityService.ts",
+        "ServerComponents/creator/IGeoJsonFeature.ts",
+        "ServerComponents/creator/IProjectRepositoryService.ts",
+        "ServerComponents/creator/MapLayerFactory.ts",
+        "ServerComponents/creator/ProjectRepositoryService.ts",
+        "ServerComponents/creator/ProxyService.ts",
+        "ServerComponents/creator/RssService.ts",
+        "ServerComponents/database/BagDatabase.ts",
+        "ServerComponents/database/IBagAddress.ts",
+        "ServerComponents/database/IBagOptions.ts",
+        "ServerComponents/database/LocalBag.ts",
+        "ServerComponents/database/Location.ts",
+        "ServerComponents/dynamic/ClientConnection.ts",
+        "ServerComponents/dynamic/DataSource.ts",
+        "ServerComponents/dynamic/DynamicLayer.ts",
+        "ServerComponents/dynamic/DynamicProject.ts",
+        "ServerComponents/dynamic/LayerDirectory.ts",
+        "ServerComponents/helpers/conrec.ts",
+        "ServerComponents/helpers/DateUtils.ts",
+        "ServerComponents/helpers/GeoJSON.ts",
+        "ServerComponents/helpers/Rss.ts",
+        "ServerComponents/helpers/RssGeoJSON.ts",
+        "ServerComponents/helpers/StringExt.ts",
+        "ServerComponents/helpers/typestate.ts",
+        "ServerComponents/helpers/Utils.ts",
+        "ServerComponents/import/AggregateOpportunitiesToGeoJsonTransformer.ts",
+        "ServerComponents/import/AggregateOpportunitiesToOrganisationTransformer.ts",
+        "ServerComponents/import/BagDetailsTransformer.ts",
+        "ServerComponents/import/BaseTransformer.ts",
+        "ServerComponents/import/BushalteAggregateTransformer.ts",
+        "ServerComponents/import/CliImporter.ts",
+        "ServerComponents/import/CollateStreamTransformer.ts",
+        "ServerComponents/import/CsvSaveTransformer.ts",
+        "ServerComponents/import/CsvToJsonTransformer.ts",
+        "ServerComponents/import/FieldFilterTransformer.ts",
+        "ServerComponents/import/FieldSplitTransformer.ts",
+        "ServerComponents/import/GeoJsonAggregateTransformer.ts",
+        "ServerComponents/import/GeoJsonFeaturesTransformer.ts",
+        "ServerComponents/import/GeoJsonOutputTransformer.ts",
+        "ServerComponents/import/GeoJsonSaveTransformer.ts",
+        "ServerComponents/import/GeoJsonSplitTransformer.ts",
+        "ServerComponents/import/IImport.ts",
+        "ServerComponents/import/IImporterRepositoryService.ts",
+        "ServerComponents/import/Importer.ts",
+        "ServerComponents/import/ImporterRepositoryService.ts",
+        "ServerComponents/import/IsoLines.ts",
+        "ServerComponents/import/IStore.ts",
+        "ServerComponents/import/ITransform.ts",
+        "ServerComponents/import/KvKToJsonTransformer.ts",
+        "ServerComponents/import/MergeGeoJsonTransformer.ts",
+        "ServerComponents/import/RepeatEnum.ts",
+        "ServerComponents/import/SplitAdresTransformer.ts",
+        "ServerComponents/import/Store.ts",
+        "ServerComponents/rules/Rule.ts",
+        "ServerComponents/rules/RuleEngine.ts",
+        "ServerComponents/rules/WorldState.ts"
+    ],
+    "exclude": []
 }