x_ite 8.4.2 → 8.4.3

package/docs/_config.yml

@@ -20,8 +20,8 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.4.2                         # x_ite latest version
-x3d_latest_version: 8.4.2                # x3d latest version
+version: 8.4.3                         # x_ite latest version
+x3d_latest_version: 8.4.3                # x3d latest version
 
 tagline: Step Into The Future          # it will display as the sub-title
 

package/docs/_posts/reference/scene-services.md

@@ -112,14 +112,22 @@ None.
 
 ### Methods
 
-#### String **getMetaData** (*String name*)
+#### Array<string> (*String name*)
 
-Returns the metadata value associated with *name.*
+Returns the metadata values array associated with *name*.
 
 #### void **setMetaData** (*String name, String value*)
 
 Creates or updates the metadata with *name* and *value.*
 
+#### void **setMetaData** (*String name, Array<string> values*)
+
+Creates or updates the metadata with *name* and *values.* There must be at least one value in *values.*
+
+#### void **addMetaData** (*String name, String value*)
+
+Adds the metadata with *name* and *value.*
+
 #### void **removeMetaData** (*String name*)
 
 Removes the metadata *name.*

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.4.2",
+	"version": "8.4.3",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/x_ite/Browser/Core/X3DCoreContext.js

@@ -303,7 +303,7 @@ X3DCoreContext .prototype =
    {
       const url = new Fields .MFString ();
 
-      url .fromString (urlCharacters, this .getExecutionContext ());
+      url .fromString ("[" + urlCharacters + "]", this .getExecutionContext ());
 
       return url;
    },

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.4.2";
+export default "8.4.3";

package/src/x_ite/Execution/X3DScene.js

@@ -246,17 +246,38 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
       return value;
    },
-   setMetaData: function (name, value)
+   setMetaData: function (name, values)
    {
-      name = String (name)
+      name = String (name);
 
       if (!name .length)
-         return;
+         throw new Error ("Couldn't add metadata: name is empty.");
+
+      if (! Array .isArray (values))
+         values = [String (values)];
 
-      this [_metadata] .set (name, String (value));
+      if (!values .length)
+         throw new Error ("Couldn't add metadata: values length is 0.");
+
+      this [_metadata] .set (name, values .map (value => String (value)));
 
       this ._metadata_changed = this .getBrowser () .getCurrentTime ();
    },
+   addMetaData: function (name, value)
+   {
+      name  = String (name);
+      value = String (value);
+
+      if (!name .length)
+         throw new Error ("Couldn't add metadata: name is empty.");
+
+      let values = this [_metadata] .get (name);
+
+      if (!values)
+         this [_metadata] .set (name, values = [ ]);
+
+      values .push (value);
+   },
    removeMetaData: function (name)
    {
       name = String (name);
@@ -269,7 +290,12 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    {
       name = String (name);
 
-      return this [_metadata] .get (name);
+      const values = this [_metadata] .get (name);
+
+      if (values)
+         return values .slice ();
+
+      return undefined;
    },
    getMetaDatas: function ()
    {
@@ -419,15 +445,18 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
       if (metadata .size)
       {
-         metadata .forEach (function (value, key)
+         for (const [key, values] of metadata .entries ())
          {
-            generator .string += "META";
-            generator .string += generator .Space ();
-            generator .string += new Fields .SFString (key) .toString ();
-            generator .string += generator .Space ();
-            generator .string += new Fields .SFString (value) .toString ();
-            generator .string += generator .Break ();
-         });
+            for (const value of values)
+            {
+               generator .string += "META";
+               generator .string += generator .Space ();
+               generator .string += new Fields .SFString (key) .toString ();
+               generator .string += generator .Space ();
+               generator .string += new Fields .SFString (value) .toString ();
+               generator .string += generator .Break ();
+            }
+         }
 
          generator .string += generator .TidyBreak ();
       }
@@ -504,21 +533,24 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
             }
          }
 
-         this .getMetaDatas () .forEach (function (value, key)
+         for (const [key, values] of this .getMetaDatas () .entries ())
          {
-            generator .string += generator .Indent ();
-            generator .string += "<meta";
-            generator .string += generator .Space ();
-            generator .string += "name='";
-            generator .string += generator .XMLEncode (key);
-            generator .string += "'";
-            generator .string += generator .Space ();
-            generator .string += "content='";
-            generator .string += generator .XMLEncode (value);
-            generator .string += "'";
-            generator .string += "/>";
-            generator .string += generator .TidyBreak ();
-         });
+            for (const value of values)
+            {
+               generator .string += generator .Indent ();
+               generator .string += "<meta";
+               generator .string += generator .Space ();
+               generator .string += "name='";
+               generator .string += generator .XMLEncode (key);
+               generator .string += "'";
+               generator .string += generator .Space ();
+               generator .string += "content='";
+               generator .string += generator .XMLEncode (value);
+               generator .string += "'";
+               generator .string += "/>";
+               generator .string += generator .TidyBreak ();
+            }
+         }
 
          // </head>
 
@@ -715,42 +747,43 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
 
             // Meta data
 
-            let i = 0;
-
-            for (const [key, value] of this .getMetaDatas ())
+            for (const [i, [key, values]] of [... this .getMetaDatas ()] .entries ())
             {
-               generator .string += generator .Indent ();
-               generator .string += '{';
-               generator .string += generator .TidyBreak ();
-               generator .string += generator .IncIndent ();
-
-               generator .string += generator .Indent ();
-               generator .string += '"';
-               generator .string += "@name";
-               generator .string += '"';
-               generator .string += ':';
-               generator .string += generator .TidySpace ();
-               generator .string += generator .JSONEncode (key);
-               generator .string += ',';
-               generator .string += generator .TidyBreak ();
-
-               generator .string += generator .Indent ();
-               generator .string += '"';
-               generator .string += "@content";
-               generator .string += '"';
-               generator .string += ':';
-               generator .string += generator .TidySpace ();
-               generator .string += generator .JSONEncode (value);
-               generator .string += generator .TidyBreak ();
-
-               generator .string += generator .DecIndent ();
-               generator .string += generator .Indent ();
-               generator .string += '}';
-
-               if (++ i !== this .getMetaDatas () .size)
+               for (const [j, value] of values .entries ())
+               {
+                  generator .string += generator .Indent ();
+                  generator .string += '{';
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .IncIndent ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@name";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (key);
                   generator .string += ',';
-
-               generator .string += generator .TidyBreak ();
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@content";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (value);
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .DecIndent ();
+                  generator .string += generator .Indent ();
+                  generator .string += '}';
+
+                  if (!(i === this .getMetaDatas () .size - 1 && j === values .length - 1))
+                     generator .string += ',';
+
+                  generator .string += generator .TidyBreak ();
+               }
             }
 
 

package/src/x_ite/Parser/VRMLParser.js

@@ -618,7 +618,7 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             {
                var metavalue = this .value;
 
-               this .getScene () .setMetaData (metakey, metavalue);
+               this .getScene () .addMetaData (metakey, metavalue);
                return true;
             }
 

package/src/x_ite/Parser/XMLParser.js

@@ -393,7 +393,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       if (metavalue === null)
          return console .warn ("XML Parser Error: Bad meta statement: Expected content attribute.");
 
-      this .getScene () .setMetaData (metakey, metavalue);
+      this .getScene () .addMetaData (metakey, metavalue);
    },
    sceneElement: function (xmlElement)
    {