Fix text labels for some 2525D symbols

Altitude/Depth was sometimes not labeled on 2525D symbols
spatialillusions · Jun 12, 2017 · eac2e84 · eac2e84
1 parent 556658c
commit eac2e84
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,24 @@
 # Change Log
 
-## 1.1.0 11 JUN 2017
+## 1.2.1 11 JUN 2017
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- Altitude/Depth was sometimes not labeled on 2525D symbols
+
+- Typo in Changelog
+
+### Security
+
+## 1.2.0 11 JUN 2017
 
 ### Added
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "milsymbol",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/spatialillusions/milsymbol",
   "authors": [
     "Måns Beckman (http://www.spatialillusions.com)"

diff --git a/dist/milsymbol.js b/dist/milsymbol.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "milsymbol",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Milsymbol.js is a small library in pure javascript that creates symbols according to MIL-STD-2525 and APP6.",
   "main": "dist/milsymbol.js",
   "directories": {

diff --git a/src/ms.js b/src/ms.js
@@ -50,7 +50,7 @@ var ms = new function() {
   this._symbolParts = [];
 
   this.autoSVG = false;
-  this.version = "1.2.0";
+  this.version = "1.2.1";
 
   if (typeof console === "object") {
     console.info(

diff --git a/src/symbolparts/textfields.js b/src/symbolparts/textfields.js
@@ -331,10 +331,10 @@ module.exports = function textfields() {
       if (this.speed || this.altitudeDepth) {
         a = [];
         if (this.speed) a.push(this.speed);
-        if (this.location) a.push(this.altitudeDepth);
+        if (this.altitudeDepth) a.push(this.altitudeDepth);
         gStrings.R4 = a.join(" ");
       }
-      if (this.staffComments || this.location) {
+      if (this.staffComments || this.additionalInformation) {
         a = [];
         if (this.staffComments) a.push(this.staffComments);
         if (this.additionalInformation) a.push(this.additionalInformation);
@@ -389,7 +389,7 @@ module.exports = function textfields() {
       gStrings.R1 = this.uniqueDesignation;
       gStrings.R2 = this.type;
       gStrings.R3 = this.iffSif;
-      if (this.staffComments || this.location) {
+      if (this.staffComments || this.additionalInformation) {
         a = [];
         if (this.staffComments) a.push(this.staffComments);
         if (this.additionalInformation) a.push(this.additionalInformation);