Merge remote-tracking branch 'origin/feature/datascource_support'

Conflicts: .gitignore README.md
GeoKnow · Apr 27, 2015 · c17bac4 · c17bac4
2 parents 6d6419d + 8be23d1
commit c17bac4
Show file tree

Hide file tree

Showing 82 changed files with 10,255 additions and 0 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "app/bower_components"
+}
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,11 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+.idea
+.tmp
+app/bower_components
+node_modules
+
+app/styles/app.css
+dist
+node
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,32 @@
+{
+  "browser": true,
+  "esnext": true,
+  "bitwise": true,
+  "camelcase": true,
+  "curly": true,
+  "eqeqeq": true,
+  "immed": true,
+  "latedef": "nofunc",
+  "newcap": true,
+  "noarg": true,
+  "quotmark": "single",
+  "regexp": true,
+  "undef": true,
+  "unused": true,
+  "globalstrict": true,
+  "trailing": true,
+  "smarttabs": true,
+  "validthis":true,
+  "globals": {
+    "angular": false,
+    "moment": false,
+    "jassa": false,
+    "$": false,
+    "L": false,
+    "FastClick": false,
+    "alert": false,
+    "_": false,
+    "console": false,
+    "JSZip": true
+  }
+}
diff --git a/README.md b/README.md
@@ -1 +1,22 @@
 # Mappify
+
+![Screenshot](mappify-dissemination/images/mappify-screenshot.png)
+
+###demo
+
+demo:  [demo](http://geoknow.github.io/Mappify/#/) 
+
+### Getting Started
+
+  - open mappify
+  - select "Load Config" and choose a predefined example
+  - you can play round with an preview by pressing "Refresh map" for an preview
+  - you can generate and download the AngularJS-app by selecting "Generate AngularJS App"
+
+###install:
+
+current develop branch: [link](https://github.com/danielkeil/mappify/tree/feature/datascource_support)
+
+- npm install
+- bower install
+- gulp dev
diff --git a/app/app.js b/app/app.js
@@ -0,0 +1,52 @@
+(function () {
+    'use strict';
+
+    angular.module('mappifyApp', [
+        'mappifyApp.sidebar',
+        'mappifyApp.main',
+        'zenubu.ngStrap',
+        'mappify',
+        'ui.router'
+    ])
+        .controller('AppCtrl', AppCtrl)
+        .filter('translate', translateFilter)
+        .config(stateProviderConfig)
+        .run(function(){
+            // Fixing image path bug: https://github.com/tombatossals/angular-leaflet-directive/issues/499
+            L.Icon.Default.imagePath = 'images';
+        })
+    ;
+
+    function translateFilter(){
+        return function(string){
+            return string;
+        };
+    }
+
+    function stateProviderConfig($stateProvider, $urlRouterProvider) {
+        $stateProvider.state('root', {
+            url: '/',
+            views: {
+                sidebar: {
+                    controller: 'SidebarController',
+                    controllerAs: 'sidebar',
+                    templateUrl: '/subsection-sidebar/sidebar.tpl.html'
+                },
+                map: {
+                    controller: 'MainController',
+                    controllerAs: 'main',
+                    templateUrl: '/subsection-main/main.tpl.html'
+
+                }
+            }
+        });
+
+        $urlRouterProvider.otherwise('/');
+    }
+
+    /* @ngInject */
+    function AppCtrl() {
+
+    }
+
+})();
diff --git a/app/images/hybrid.png b/app/images/hybrid.png
diff --git a/app/images/marker-icon-2x.png b/app/images/marker-icon-2x.png
diff --git a/app/images/marker-icon.png b/app/images/marker-icon.png
diff --git a/app/images/marker-shadow.png b/app/images/marker-shadow.png
diff --git a/app/images/osm.png b/app/images/osm.png
diff --git a/app/images/roadmap.png b/app/images/roadmap.png
diff --git a/app/images/satellite.png b/app/images/satellite.png
diff --git a/app/images/terrain.png b/app/images/terrain.png
diff --git a/app/index.html b/app/index.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<!--[if lt IE 7]>
+<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>
+<html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>
+<html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!-->
+<html class="no-js" ng-app="mappifyApp"> <!--<![endif]-->
+<head>
+    <meta charset="utf-8">
+    <title>Mappify</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width">
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,300,400italic,400,600italic,600,700italic,700,800italic,800"
+          rel="stylesheet" type="text/css">
+    <script src="//maps.google.com/maps/api/js?v=3&sensor=false"></script>
+    <!-- inject:vendor:css -->
+    <!-- endinject -->
+    <!-- inject:css -->
+    <link href="bower_components/jassa-ui-angular/jassa-ui-angular.css" rel="stylesheet" type="text/css">
+    <!-- endinject -->
+
+
+</head>
+<body ng-cloak>
+<div ng-controller="AppCtrl" style="height: 100%;">
+    <div class="col-lg-3 col-md-4 col-xs-4" style="padding: 0; height: 100%">
+        <div ui-view="sidebar" id="sidebar" ></div>
+    </div>
+    <div class="col-lg-9 col-md-8 col-xs-8" style="padding: 0;">
+        <div ui-view="map"></div>
+    </div>
+</div>
+
+<!-- inject:vendor:js -->
+<!-- endinject -->
+<!-- endref -->
+
+<script src="bower_components/dddi-angular/dddi-angular.js"></script>
+<script src="bower_components/jassa/jassa.js"></script>
+<script src="bower_components/jassa-ui-angular/jassa-ui-angular-tpls.js"></script>
+
+<!-- inject:js -->
+<!-- endinject -->
+<script>
+    // global jassa object
+    var jassa = new Jassa(Promise, function() {
+        var jqXHR = $.ajax.apply(this, arguments);
+        // todo: move to util method
+        // r short form for inline result
+        var r = Promise.resolve(jqXHR)
+                .cancellable()
+                .catch(Promise.TimeoutError, Promise.CancellationError, function(e) {
+                    jqXHR.abort();
+                    throw e;
+                });
+        return r;
+    });
+</script>
+</body>
+</html>
diff --git a/app/styles/app.less b/app/styles/app.less
@@ -0,0 +1,170 @@
+/* Imports dependencies like bootstrap, etc. */
+@import "dependencies";
+@import "variables.less";
+/* Imports app-wide styles */
+@import "globals/map";
+@import "globals/modals";
+
+/* app wide general styles */
+
+html {
+  height: 100%;
+}
+
+body {
+  font-size: 12px;
+  height: 100%;
+  background: #fff;
+  overflow-x: hidden;
+  min-height: 100%;
+  font-family: 'Open Sans', Calibri, Arial, sans-serif;
+}
+
+a {
+  cursor: pointer;
+}
+
+.text-vertical-middle {
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  flex-direction: column;
+}
+
+#map {
+  height: 100vh;
+}
+
+/**** */
+//
+
+#sidebar {
+  padding-left: 0;
+  right: 0;
+
+  hr {
+    border-color: #ddd;
+    margin: 10px 15px;
+  }
+
+  &, & a {
+    color: #444;
+  }
+
+  ul.navigation {
+    list-style: none outside none;
+    margin: 0;
+    padding: 0;
+
+    li a {
+      display: block;
+      font-size: 14px;
+      padding: 12px 20px;
+
+      &:hover, &:focus {
+        text-decoration: none;
+        background: #f0f0f0;
+      }
+
+      i {
+        margin-left: 10px;
+      }
+
+    }
+
+  }
+
+  i {
+    font-size: 16px;
+    margin-right: 15px;
+    position: relative;
+  }
+
+  .btn {
+    text-align: left;
+  }
+
+}
+
+textarea {
+  height: 300px;
+  width: 100%;
+}
+
+.colorBox {
+  height: 20px;
+  width: 30px;
+}
+
+.tile-layer-preview {
+  position: relative;
+  background: url(../images/satellite.png) no-repeat center center;
+  height: 100px;
+  width: 100%;
+  cursor: pointer;
+  margin-bottom: 15px;
+
+  .preview-inactive {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: black;
+    opacity: 0.5;
+  }
+
+  .fa-stack {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+  }
+
+  .badge {
+    position: absolute;
+    bottom: 10px;
+    left: 10px;
+  }
+
+}
+
+.flex-rows {
+
+  &-single, &-multiple {
+    height: 300px;
+    width: 100%;
+    overflow-y: scroll;
+    display: flex;
+    align-content: flex-start;
+    span {
+      cursor: pointer;
+      padding: 0;
+      border: 1px solid black;
+      max-height: 26px;
+      margin-bottom: 4px;
+
+      .fa.fa-fw {
+        width: 30px;
+        font-size: 18px;
+        padding: 4px;
+        text-align: center;
+      }
+    }
+  }
+
+  &-single {
+    flex-flow: row;
+    justify-content: flex-start;
+
+    span {
+      margin: 0 2px 4px;
+    }
+
+  }
+
+  &-multiple {
+    flex-flow: row wrap;
+    justify-content: space-between;
+
+  }
+}