When adding feature to a layer, geometry type subtitle will be shown …

…to the user. Updated button tooltips to show clarity of button purposes.
davisc · Aug 31, 2015 · 3140d1a · 3140d1a
1 parent a6157ff
commit 3140d1a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/src/app/locales/en.js b/src/app/locales/en.js
@@ -229,8 +229,10 @@
     'switch_coords': 'Switch Coordinate Display',
     'accept_feature': 'Accept Feature',
     'cancel_feature': 'Cancel Feature',
-    'add_to_feature': 'Add To Feature',
-    'remove_from_feature': 'Remove From Feature',
+    'geometry_type': 'Geometry Type: ',
+    'add_to_feature': 'Add New',
+    'remove_from_feature': 'Remove Selected',
+    'geometry_to': 'Geometry to',
     'draw': 'Draw',
     'zoom_to_data': 'Zoom to data',
     'show_layer_info': 'Show Layer Info',

diff --git a/src/common/featuremanager/ExclusiveModeService.js b/src/common/featuremanager/ExclusiveModeService.js
@@ -2,6 +2,7 @@
   var module = angular.module('loom_exclusive_mode_service', []);
 
   var title_ = '';
+  var subtitle_ = '';
   var buttons_ = [];
   var pulldownService_ = null;
   var enabled_ = false;
@@ -32,10 +33,22 @@
       return title_;
     };
 
+    this.getSubtitle = function() {
+      return subtitle_;
+    };
+
     this.getType = function() {
       return geometryType_;
     };
 
+    this.getBaseType = function() {
+      if (this.isMultiType()) {
+        return this.getType().split('Multi')[1];
+      } else {
+        return this.getType();
+      }
+    };
+
     this.getButtonOne = function() {
       return buttons_[0];
     };
@@ -62,8 +75,9 @@
       return false;
     };
 
-    this.startExclusiveMode = function(title, buttonOne, buttonTwo, geometryType) {
+    this.startExclusiveMode = function(title, subtitle, buttonOne, buttonTwo, geometryType) {
       title_ = title;
+      subtitle_ = subtitle;
       buttons_ = [buttonOne, buttonTwo];
       enabled_ = true;
       angular.element('#pulldown-menu').collapse('hide');

diff --git a/src/common/featuremanager/FeatureManagerService.js b/src/common/featuremanager/FeatureManagerService.js
@@ -424,7 +424,9 @@
         geometryType = geometryType.replace('Curve', 'LineString');
       }
       geometryType = geometryType.replace('Surface', 'Polygon');
+
       exclusiveModeService_.startExclusiveMode(translate_.instant('drawing_geometry'),
+          translate_.instant('geometry_type') + geometryType,
           exclusiveModeService_.button(translate_.instant('accept_feature'), function() {
             if (mapService_.editLayer.getSource().getFeatures().length < 1) {
               dialogService_.warn(translate_.instant('adding_feature'), translate_.instant('must_create_feature'),

diff --git a/src/common/featuremanager/partial/exclusivemode.tpl.html b/src/common/featuremanager/partial/exclusivemode.tpl.html
@@ -1,17 +1,18 @@
 <div id="exclusive-mode-container" class="panel-group collapse flat-top">
   <div id="exclusive-mode-panel" class="panel in">
-    <div align="center"><h5>{{exclusiveModeService.getTitle()}}</h5></div>
+    <div align="center"><h4>{{exclusiveModeService.getTitle()}}</h4></div>
+      <div align="center"><h6>{{exclusiveModeService.getSubtitle()}}</h6></div>
     <div class="btn-group-wrap">
 
     <button ng-click="exclusiveModeService.getButtonTwo().callback()" class="btn btn-sm btn-danger" tooltip-append-to-body="true"
             tooltip-placement="bottom" tooltip="{{exclusiveModeService.getButtonTwo().title}}"><i class="glyphicon glyphicon-remove"></i></button>
     <div ng-show="exclusiveModeService.isMultiType()" class="btn-group">
       <button class="btn btn-sm btn-default" tooltip-append-to-body="true" ng-click="exclusiveModeService.addToFeature()"
-              tooltip-placement="bottom" tooltip="{{'add_to_feature' | translate}}"><i class="glyphicon glyphicon-plus"></i></button>
+              tooltip-placement="bottom" tooltip="{{'add_to_feature' | translate}} {{exclusiveModeService.getBaseType()}} {{'geometry_to' | translate}} {{exclusiveModeService.getType()}}"><i class="glyphicon glyphicon-plus"></i></button>
       <button class="btn btn-sm btn-default" tooltip-append-to-body="true" ng-click="exclusiveModeService.orthogonalize()" ng-show="exclusiveModeService.isPolygon()"
               tooltip-placement="bottom" tooltip="{{'right_angles' | translate}}"><i class="glyphicon glyphicon-fullscreen"></i></button>
       <button class="btn btn-sm btn-default" tooltip-append-to-body="true" ng-click="exclusiveModeService.removeFromFeature()"
-              tooltip-placement="bottom" tooltip="{{'remove_from_feature' | translate}}"><i class="glyphicon glyphicon-minus"></i></button>
+              tooltip-placement="bottom" tooltip="{{'remove_from_feature' | translate}} {{exclusiveModeService.getBaseType()}} {{'from' | translate}} {{exclusiveModeService.getType()}}"><i class="glyphicon glyphicon-minus"></i></button>
     </div>
     <button class="btn btn-sm btn-default" tooltip-append-to-body="true" ng-show="!exclusiveModeService.isMultiType() && exclusiveModeService.isPolygon()"
             tooltip-placement="bottom" tooltip="{{'right_angles' | translate}}" ng-click="exclusiveModeService.orthogonalize()"><i class="glyphicon glyphicon-fullscreen"></i></button>
@@ -23,4 +24,4 @@
     </div>
 
   </div>
-</div>
+</div>