@openglobus/og 0.12.1 → 0.13.0

package/src/og/entity/RayHandler.js

@@ -374,7 +374,7 @@ class RayHandler {
         var gl = h.gl,
             ec = this._entityCollection;
 
-        gl.polygonOffset(ec.polygonOffsetFactor, ec.polygonOffsetUnits);
+        //gl.polygonOffset(ec.polygonOffsetFactor, ec.polygonOffsetUnits);
 
         gl.uniform1f(shu.uOpacity, ec._fadingOpacity);
 

package/src/og/layer/CanvasTiles.js

@@ -227,12 +227,15 @@ class CanvasTiles extends Layer {
     applyMaterial(material) {
         if (material.isReady) {
             return [0, 0, 1, 1];
-        } else {
-            !material.isLoading && this.loadMaterial(material);
-
+        } else {
+
             var segment = material.segment;
             var pn = segment.node,
                 notEmpty = false;
+
+            if (segment.passReady && !material.isLoading) {
+                this.loadMaterial(material);
+            }
 
             var mId = this._id;
             var psegm = material;

package/src/og/layer/GeoImage.js

@@ -212,4 +212,4 @@ class GeoImage extends BaseGeoImage {
     }
 }
 
-export { GeoImage };
+export { GeoImage };

package/src/og/layer/KML.js

@@ -3,6 +3,7 @@
  */
 
 "use strict";
+import { Billboard } from "../entity/Billboard.js";
 import { Entity } from "../entity/Entity.js";
 import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
@@ -36,23 +37,25 @@ export class KML extends Vector {
     }
 
     /**
-     * @private
+     * @public
      */
     _extractCoordonatesFromKml(xmlDoc) {
         const raw = Array.from(xmlDoc.getElementsByTagName("coordinates"));
-        const coordinates = raw.map((item) =>
-            item.textContent
-                .trim()
-                .replace(/\n/g, " ")
-                .split(" ")
-                .map((co) => co.split(",").map(parseFloat))
+        const rawText = raw.map(item => item.textContent.trim());
+        const coordinates = rawText.map(item => 
+            item
+             .replace(/\n/g, " ")
+             .replace(/\t/g, " ")
+             .replace(/ +/g," ")
+             .split(" ")
+             .map((co) => co.split(",").map(parseFloat))
         );
         return coordinates;
     }
 
     /**
      * Creates billboards or polylines from array of lonlat.
-     * @private
+     * @public
      * @param {Array} coordonates
      * @param {string} color
      * @returns {Array<Entity>}
@@ -90,7 +93,7 @@ export class KML extends Vector {
     }
 
     /**
-     * @private
+     * @public
      * @returns {Document}
      */
     _getXmlContent(file) {
@@ -103,7 +106,7 @@ export class KML extends Vector {
     }
 
     /**
-     * @private
+     * @public
      */
     _expandExtents(extent1, extent2) {
         if (!extent1) return extent2;
@@ -121,15 +124,17 @@ export class KML extends Vector {
     /**
      * @public
      * @param {File[]} kmls
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
      * @returns {Promise<{entities: Entity[], extent: Extent}>}
      */
-    async addKmlFromFiles(kmls) {
+    async addKmlFromFiles(kmls, color = null, billboard = null) {
         const kmlObjs = await Promise.all(kmls.map(this._getXmlContent));
         const coordonates = kmlObjs.map(this._extractCoordonatesFromKml);
         const { entities, extent } = this._convertCoordonatesIntoEntities(
             coordonates,
-            this._color,
-            this._billboard
+            color || this._color,
+            billboard || this._billboard
         );
         this._extent = this._expandExtents(this._extent, extent);
         entities.forEach(this.add.bind(this));
@@ -146,7 +151,7 @@ export class KML extends Vector {
     }
 
     /**
-     * @private
+     * @public
      */
     _getKmlFromUrl(url) {
         return new Promise((resolve, reject) => {
@@ -168,15 +173,17 @@ export class KML extends Vector {
     /**
      * @public
      * @param {string} url - Url of the KML to display. './myFile.kml' or 'http://mySite/myFile.kml' for example.
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
      * @returns {Promise<{entities: Entity[], extent: Extent}>}
      */
-    async addKmlFromUrl(url) {
+    async addKmlFromUrl(url, color = null, billboard = null) {
         const kml = await this._getKmlFromUrl(url);
         const coordonates = this._extractCoordonatesFromKml(kml);
         const { entities, extent } = this._convertCoordonatesIntoEntities(
             [coordonates],
-            this._color,
-            this._billboard
+            color || this._color,
+            billboard || this._billboard
         );
         this._extent = this._expandExtents(this._extent, extent);
         entities.forEach(this.add.bind(this));