Fix identity file

addon/components/flexberry-identify-file.js

@@ -2,6 +2,7 @@ import Ember from 'ember';
 import layout from '../templates/components/flexberry-identify-file';
 import CheckFileMixin from '../mixins/flexberry-check-file';
 import { availableCoordinateReferenceSystemsCodesWithCaptions } from '../utils/available-coordinate-reference-systems-for-dropdown';
+import { translationMacro as t } from 'ember-i18n';
 
 export default Ember.Component.extend(CheckFileMixin, {
   layout,
@@ -49,6 +50,33 @@ export default Ember.Component.extend(CheckFileMixin, {
 
   emptyGeometryField: 'Укажите название поля с геометрией в файле (WKT/X,Y)',
 
+  /**
+    Tools option's 'marker' mode's caption.
+
+    @property markerCaption
+    @type String
+    @default t('components.flexberry-identify-file.marker.caption')
+  */
+  markerCaption: t('components.flexberry-identify-file.marker'),
+
+  /**
+    Tools option's 'polyline' mode's caption.
+
+    @property polylineCaption
+    @type String
+    @default t('components.flexberry-identify-file.polyline.caption')
+  */
+  polylineCaption: t('components.flexberry-identify-file.polyline.caption'),
+
+  /**
+    Tools option's 'polyline' mode's caption.
+
+    @property polygonCaption
+    @type String
+    @default t('components.flexberry-identify-file.polygon.caption')
+  */
+  polygonCaption: t('components.flexberry-identify-file.polygon.caption'),
+
   /**
    * We need to differentiate events from different instances, because we don't turn off event subscriptions
    *
@@ -60,6 +88,11 @@ export default Ember.Component.extend(CheckFileMixin, {
 
   init() {
     this._super(...arguments);
+    this.set('_geometryTypes', {
+      'point': 'Точка',
+      'polyline': 'Ломаная',
+      'polygon': 'Полигон'
+    });
   },
 
   setAcceptFiles() {
@@ -156,12 +189,14 @@ export default Ember.Component.extend(CheckFileMixin, {
           this.set('_errorMessage', this.get('importErrorMessage') + this.get('emptyHeaderErrorMessage'));
           this.set('_showError', true);
           this.set('needGeometryFieldName', false);
+          this.set('needGeometryType', false);
         }
       }).fail(() => {
         let message = this.get('badFileMessage');
         this.set('_errorMessage', this.get('importErrorMessage') + message);
         this.set('_showError', true);
         this.set('needGeometryFieldName', false);
+        this.set('needGeometryType', false);
       });
     }
   },
@@ -176,6 +211,7 @@ export default Ember.Component.extend(CheckFileMixin, {
       this.set('file', null);
       this.set('coordinate', 'auto');
       this.set('needGeometryFieldName', false);
+      this.set('needGeometryType', false);
       this.set('geometryField1', null);
       this.set('geometryField2', null);
       this.set('geometryFieldFile', null);
@@ -205,6 +241,10 @@ export default Ember.Component.extend(CheckFileMixin, {
         this.set('warningMessage', this.get('warningMessageSRS'));
       }
 
+      if (ext.toLowerCase() === '.gpx') {
+        this.set('needGeometryType', true);
+      }
+
       this.clearAjax();
       this.$('.ui.button.upload').addClass('hidden');
       this.$('.ui.button.remove').removeClass('hidden');

addon/locales/en/components.js

@@ -22,6 +22,7 @@ import FlexberryLinksEditorComponent from './components/flexberry-links-editor';
 import FlexberryWfsFilterComponent from './components/flexberry-wfs-filter';
 import FlexberryBoundingboxComponent from './components/flexberry-boundingbox';
 import FlexberryEditCrsComponent from './components/flexberry-edit-crs';
+import FlexberryIdentifyFile from './components/flexberry-identify-file';
 import FlexberryIdentifyPanel from './components/flexberry-identify-panel';
 import FlexberryLayersAttributesPanel from './components/flexberry-layers-attributes-panel';
 import FlexberryLayersIntersectionPanel from './components/flexberry-layers-intersections-panel';
@@ -63,6 +64,7 @@ export default {
   'flexberry-wfs-filter': FlexberryWfsFilterComponent,
   'flexberry-boundingbox': FlexberryBoundingboxComponent,
   'flexberry-edit-crs': FlexberryEditCrsComponent,
+  'flexberry-identify-file': FlexberryIdentifyFile,
   'flexberry-identify-panel': FlexberryIdentifyPanel,
   'flexberry-layers-attributes-panel': FlexberryLayersAttributesPanel,
   'flexberry-layers-intersections-panel': FlexberryLayersIntersectionPanel,

addon/locales/en/components/flexberry-identify-file.js

@@ -0,0 +1,17 @@
+export default {
+  'marker': {
+    'caption': 'Point'
+  },
+  'polyline': {
+    'caption': 'Polyline'
+  },
+  'polygon': {
+    'caption': 'Polygon'
+  },
+  'geometry-type': {
+    'caption': 'Geometry type'
+  },
+  'geometry-fields': {
+    'caption': 'Fields with geometry in the file'
+  }
+};

addon/locales/ru/components.js

@@ -22,6 +22,7 @@ import FlexberryLinksEditorComponent from './components/flexberry-links-editor';
 import FlexberryWfsFilterComponent from './components/flexberry-wfs-filter';
 import FlexberryBoundingboxComponent from './components/flexberry-boundingbox';
 import FlexberryEditCrsComponent from './components/flexberry-edit-crs';
+import FlexberryIdentifyFile from './components/flexberry-identify-file';
 import FlexberryIdentifyPanel from './components/flexberry-identify-panel';
 import FlexberryLayersAttributesPanel from './components/flexberry-layers-attributes-panel';
 import FlexberryLayersIntersectionPanel from './components/flexberry-layers-intersections-panel';
@@ -63,6 +64,7 @@ export default {
   'flexberry-wfs-filter': FlexberryWfsFilterComponent,
   'flexberry-boundingbox': FlexberryBoundingboxComponent,
   'flexberry-edit-crs': FlexberryEditCrsComponent,
+  'flexberry-identify-file': FlexberryIdentifyFile,
   'flexberry-identify-panel': FlexberryIdentifyPanel,
   'flexberry-layers-attributes-panel': FlexberryLayersAttributesPanel,
   'flexberry-layers-intersections-panel': FlexberryLayersIntersectionPanel,

addon/locales/ru/components/flexberry-identify-file.js

@@ -0,0 +1,17 @@
+export default {
+  'marker': {
+    'caption': 'Точка'
+  },
+  'polyline': {
+    'caption': 'Ломаная'
+  },
+  'polygon': {
+    'caption': 'Полигон'
+  },
+  'geometry-type': {
+    'caption': 'Тип геометрии'
+  },
+  'geometry-fields': {
+    'caption': 'Название полей с геометрией в файле'
+  }
+};

addon/mixins/flexberry-check-file.js

@@ -13,6 +13,8 @@ export default Ember.Mixin.create({
 
   coordinate: null,
   geometryType: null,
+  _geometryTypes: [],
+  _geometryType: null,
 
   importErrorMessage: t('components.geometry-add-modes.import.import-error.message'),
   createLayerErrorMessage: t('components.geometry-add-modes.import.create-layer-error.message'),
@@ -126,6 +128,10 @@ export default Ember.Mixin.create({
       data.append(file.name, file);
       data.append('crs', this.get('coordinate'));
 
+      if (this.get('needGeometryType')) {
+        data.append('typeGeometryLayer', this.get('_geometryType'));
+      }
+
       if (this.get('needGeometryFieldName')) {
         data.append('geometryFieldFile', this.get('geometryFieldFile'));
       }

addon/templates/components/flexberry-identify-file.hbs

@@ -19,9 +19,20 @@
     }}
   </div>
 
+  {{#if needGeometryType}}
+    <div class="field geometryField">
+      <label>{{t "components.flexberry-identify-file.geometry-type.caption"}} <span class="required">*</span></label>
+      {{flexberry-dropdown
+        class=(concat "fluid geometryType")
+        items=_geometryTypes
+        value=_geometryType
+        displayCaptions=true
+      }}
+    </div>
+  {{/if}}
   {{#if needGeometryFieldName}}
     <div class="field geometryField">
-      <label>Название полей с геометрией в файле*</label>
+      <label>{{t "components.flexberry-identify-file.geometry-fields.caption"}} <span class="required">*</span></label>
       {{flexberry-dropdown
         class=(concat "fluid geometryField1")
         items=_availableFields