Merge pull request #12 from lagoproject/dev

testing

_includes/generate_html_for_sites.html

+<!-- 
+################################################################################
+# Original Author: A.J. Rubio-Montero (http://orcid.org/0000-0001-6497-753X),  #
+#          CIEMAT - Sci-Track Group (http://rdgroups.ciemat.es/web/sci-track), #
+#          for the EOSC-Synergy project (EU H2020 RI Grant No 857647).         #
+# License (SPDX): BSD-3-Clause (https://opensource.org/licenses/BSD-3-Clause)  #
+# Copyright (c): 2020-today, The LAGO Collaboration (http://lagoproject.net)   #
+################################################################################
+-->
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script>
+function itemnize_json( json, context, link ) { 
+  var html ='';
+  if ( (link == false) || (typeof(json) === 'boolean') )  return json;
+  if ( typeof(json) === 'string' ) {
+    var element = json.split(':');
+    var innid = element[0];
+    var vocab = "@vocab";
+    if (element.length == 2) {
+      if ( (element[0] !== "http") && (element[0] !== "https") ) {
+        innid = element[1];
+        vocab = element[0];
+      } else return '<a href="'+ json +'">'+ json +'</a>';
+    } else return json;
+    var contexturl = context[vocab];
+    if ( vocab == "lago" ) { 
+        contexturl = 'https://lagoproject.github.io/DMP/schema/lagoSchema/';
+        innid = json;
+    };  
+    if ( contexturl[contexturl.length-1] !== '#' )  contexturl = contexturl + '#';
+    if ( vocab == "sdo" ) contexturl = context[vocab];
+    html = '<a href="'+ contexturl + innid +'">'+ json +'</a>';
+  } else {
+    if ( !(Array.isArray(json)) ) {
+      var json_aux = [];
+      json_aux.push(json);
+      json = json_aux;
+    };
+    for (var j=0; j<json.length; j++) {
+      var inner_json = json[j];
+      if ( !(typeof(json[j]) === 'string') ) {
+      	if ("@id" in json[j]) {
+          inner_json = json[j]["@id"];
+        } else {
+          inner_json = JSON.stringify(json[j]);
+	  link = false;
+        };
+      };
+      html = html + '<br />' + itemnize_json(inner_json, context, link);
+    };
+  };
+  return html;
+};
+function gmap_static(lat, long, type) {
+    return '<div style="width: 100%"><iframe class="iframe" src="https://maps.google.com/?ll='+lat+','+long+'&amp;z=13&amp;t='+type+'amp;iwloc=B&amp;output=embed" height="200" allowfullscreen></iframe></div>';
+};
+$().ready(function(){
+    $.getJSON( "{{ include.folder }}", function( data ) { 
+        var graphelements = data["@graph"];
+        for (var i=0; i<graphelements.length; i++) {
+            var element = graphelements[i];
+            var id = element["@id"];
+            var indexhtml = '<li><a href="#'+id+'"><strong>'+id+'</strong> ['+element["name"]+'].'+'</a></li>';
+            var headerhtml = '<h5 id="'+id+'"><a href="#'+id+'" class="anchor-heading" aria-labelledby="'+id+'"><svg viewBox="0 0 16 16" aria-hidden="true"><use xlink:href="#svg-link"></use></svg></a><strong>'+id+'</strong></h5>';
+            headerhtml = headerhtml+'<p>'+'Site located in '+element["name"];
+            if (["qualifiedAttribution"]["name"] !== "") {
+                headerhtml = headerhtml+' and managed by '+element["qualifiedAttribution"]["name"];
+            };
+            headerhtml = headerhtml+'.'+'</p>';
+            if ("comment" in element) {
+                headerhtml = headerhtml+'<p>'+ element["comment"][0]["@value"]+'</p>';
+            };
+            headerhtml = headerhtml+gmap_static(element["geometry"]["geo:latitude"],element["geometry"]["geo:longitude"],"k");
+            if (element["lago:belongsLago"]) {
+                $('#iproperties').append(indexhtml);
+                $('#properties').append(headerhtml);              
+            } else {
+                $('#iclasses').append(indexhtml);
+                $('#classes').append(headerhtml);
+            };   
+            var keysUP = Object.keys(element);
+            keysUP.splice(keysUP.indexOf("@id"),1);
+            keysUP.splice(keysUP.indexOf("@type"),1);
+            keysUP.splice(keysUP.indexOf("comment"),1);
+            keysUP.splice(keysUP.indexOf("name"),1);
+            keysUP.splice(keysUP.indexOf("lago:belongsLago"),1);
+            keysUP.splice(keysUP.indexOf("qualifiedAttribution"),1);
+            table = '<ul> The default propierties defined for <strong>'+ id + '</strong> site are:' ;
+            for (var up=0; up<keysUP.length; up++) {
+                var keys = Object.keys(element[keysUP[up]]);
+                table = table + '<li>'+ itemnize_json(keysUP[up], data["@context"], true )+' :';
+                table = table + '<table class="grid" style="width: 100%"> 
+                    <thead>
+                        <tr class="header">';  
+                for (var k=0; k<keys.length; k++) {
+                    table = table + ' <th>'+ itemnize_json([keys[k]], data["@context"], true ) + '</th>';
+                };
+                table = table +' </tr>
+                    </thead>
+                    <tbody>
+                        <tr>';
+                for (var k=0; k<keys.length; k++) {
+                    table = table +' <td>'+ itemnize_json(element[keysUP[up]][keys[k]] , data["@context"], true ) +'</td>';
+                };
+                table = table +' </tr>
+                    </tbody>
+                </table>';
+                table = table + '</li>';
+            };
+            table = table + '</ul>';
+            if (element["lago:belongsLago"]) {
+                $('#properties').append(table);				  
+            } else {
+                $('#classes').append(table);
+            };
+        };		
+    });
+});
+</script>
+
+{% if include.vocabulary == "true" %}
+
+- [**Classes**](#classes)
+  <ul id="iclasses"></ul>
+		
+- [**Properties**](#properties)
+  <ul id="iproperties"></ul>
+
+### Classes
+
+<div id="classes"></div>
+
+### Properties
+
+<div id="properties"></div>
+
+{% else %}
+
+- [**Official LAGO sites**](#lago)
+  <ul id="iproperties"></ul>
+- [**non-LAGO sites**](#non-lago)
+  <ul id="iclasses"></ul>
+
+
+### Official LAGO sites
+
+<div id="properties"></div>
+
+
+### non-LAGO sites
+
+<div id="classes"></div>
+
+
+{% endif %}
+

_includes/generate_html_for_vocab.html

@@ -20,13 +20,15 @@ function itemnize_json( json, context, link ) {
       if ( (element[0] !== "http") && (element[0] !== "https") ) {
         innid = element[1];
         vocab = element[0];
-      } else return json;
-    };
+      } else return '<a href="'+ json +'">'+ json +'</a>';
+    } else return json;
     var contexturl = context[vocab];
-    if ( vocab == "lago" ) contexturl = '';  
+    if ( vocab == "lago" ) { 
+        contexturl = 'https://lagoproject.github.io/DMP/schema/lagoSchema/';
+        innid = json;
+    };    
     if ( contexturl[contexturl.length-1] !== '#' )  contexturl = contexturl + '#';
     if ( vocab == "sdo" ) contexturl = context[vocab];
-    else innid = json;
     html = '<a href="'+ contexturl + innid +'">'+ json +'</a>';
   } else {
     if ( !(Array.isArray(json)) ) {
@@ -69,7 +71,7 @@ $().ready(function(){
 			    <tr class="header">
 				<th>@type</th>';	  
 	  for (var k=0; k<keys.length; k++) {
-	    table = table + ' <th>'+ keys[k] + '</th>';
+	    table = table + ' <th>'+  itemnize_json(keys[k] , data["@context"], true ) + '</th>';
 	  };
 	  table = table +'	</tr>
 			</thead>
@@ -83,9 +85,9 @@ $().ready(function(){
 			</tbody>
 		    </table>';
           if ("dcat:domain" in graphelements[i]) {
-                  $('#iproperties').append(indexhtml);
+            $('#iproperties').append(indexhtml);
             $('#properties').append(headerhtml);
-                  $('#properties').append(table);				  
+            $('#properties').append(table);				  
           } else {
             $('#iclasses').append(indexhtml);
             $('#classes').append(headerhtml);
@@ -111,7 +113,7 @@ $().ready(function(){
 
 ### Properties
 
-<div  id="properties"></div>
+<div id="properties"></div>
 
 {% else %}
 

_includes/head_custom.html

+{% if page.jsonldinhead %}
+    <script type="application/ld+json">
+    {% include_relative {{page.jsonldinhead}} %}
+    </script>
+{% endif %}
\ No newline at end of file

defs/sitesLago.md

@@ -70,7 +70,7 @@ As a real example, the metadata´s catalog of a simulation should include the si
 
 ## Defined LAGO sites
 
-{% include generate_html_for_vocab.html folder="/DMP/defs/sitesLago.jsonld" %}
+{% include generate_html_for_sites.html folder="/DMP/defs/sitesLago.jsonld" %}
 
 
 ## Plain JSON-LD file

rights/AUP.md

 ---
 layout: default
 parent: Rights
-nav_order: 4
+nav_order: 2
 ---
 
 

rights/lagoCommonRights.jsonld

 {
-  "TBD" : "TBD."
+  "@context" : {
+    "@base" : "https://raw.githubusercontent.com/lagoproject/DMP/1.1", 
+    "lago" : "https://raw.githubusercontent.com/lagoproject/DMP/1.1/schema/lagoSchema.jsonld#",
+    "dct" : "http://purl.org/dc/terms/",
+    "@vocab" : "https://raw.githubusercontent.com/SEMICeu/DCAT-AP/2.0.0/releases/2.0.0/dcat-ap_2.0.0.jsonld#",
+    "_dcatap" : "https://raw.githubusercontent.com/SEMICeu/DCAT-AP/2.0.0/releases/2.0.0/dcat-ap_2.0.0.jsonld",
+    "_dcatap_landing_page" : "http://data.europa.eu/r5r/"
+  },
+"@id" : "/rights/lagoCommonRights.jsonld",
+"title": "Data and Metadata Release, Rights and Disclaimer",
+"creator" : [{ "@id" : "https://orcid.org/0000-0002-4559-8785" , "@type" : "lago:Person", "name" : "Hernán Asorey" },
+             { "@id" : "https://orcid.org/0000-0003-4115-3129" , "@type" : "lago:Person", "name" : "Iván Sidelnik" }],
+"releaseDate": "2022-05-10",
+"conformsTo": { "@id" : "https://github.github.com/gfm/" , "@type" : "Document", "title": "GitHub Flavored Markdown Spec", "preferredLabel" :"GFM"},
+"relatedResource" : "https://lagoproject.net/FALTA",
+"publisher" :  { "@id" : "/defs/lagoCollaboration.jsonld" , "@type" : "lago:Organization", "name" : "LAGO Collaboration" },
+"license" : "https://creativecommons.org/licenses/by-nc-sa/4.0/",
+"accessRigths" : "@id",
+"descprition" : "By using the data provided by the Latin American Giant Observatory (LAGO), you are accepting the following conditions of release and acknowledging the following disclaimers issued by LAGO.",
+"@type": "Document",
+"landingPage": "https://lagoproject.github.io/DMP/rights/lagoCommonRights/",
+"version":"1.1",
+"distribution": { "@id": "/rights/lagoCommonRights.md", 
+                  "@type": "Distribution",
+                  "accessURL": "/rights/lagoCommonRights/",
+                  "downloadURL": "/rights/lagoCommonRights.md", 
+                  "format": "http://publications.europa.eu/resource/authority/file-type/TXT",  
+                  "mediaType": "https://www.iana.org/assignments/media-types/text/markdown"
+                }
 }

rights/lagoCommonRights.md

@@ -2,15 +2,21 @@
 layout: default
 parent: Rights
 nav_order: 1
+jsonldinhead: lagoCommonRights.jsonld 
 ---
 
-# LAGO Common Rights 
-{: .no_toc }
+# Data and Metadata Releases, Rights and Disclaimer 
+
+|Tag Release | Issued | Updated | Dates |Contributors|
+|------------|-----   |-------- |------|------------|
+| 1.1 | 2022-05-11 | {{ site.time }} | 2020-06-01 - today | [Hernán Asorey](https://orcid.org/0000-0002-4559-8785) |
+|  |  |  |  | [Iván Sidelnik](https://orcid.org/0000-0003-4115-3129) |
+|  |  |  |  | for the [LAGO Collaboration](/DMP/defs/lagoCollaboration/) |
 
-|Version| Updated | Date |Contributors|
-|-------|---------|------|------------|
-| 1.1 develop | {{ site.time }} | 2020-06-01 - today | LAGO Collaboration |
+# Data and Metadata Releases, Rights and Disclaimer 
+{: .no_toc }
 
+By using the data provided by the Latin American Giant Observatory (LAGO), you are accepting the following conditions of release and acknowledging the following disclaimers issued by LAGO.
 
 ## Table of contents
 {: .no_toc .text-delta }
@@ -18,11 +24,73 @@ nav_order: 1
 - TOC
 {:toc}
 
-## What is defined?
+## A. Definitions
+
+### a. The Latin American Giant Observatory
+The Latin American Giant Observatory hereinafter referred to as “LAGO” or “the LAGO Observatory”, is an astroparticle observatory on a global scale, working as an integrated detection network, hereinafter referred to as “the LAGO detection network” or simply “the LAGO network”, of single or small arrays of detectors, hereinafter referred to as “the LAGO detectors”, that are deployed at different geographical locations, hereinafter referred as “the LAGO sites”.   
+
+### b. The LAGO Collaboration
+
+The LAGO Collaboration is a non-centralized, distributed and highly collaborative grid of scientific institutions. The main goal of the LAGO Collaboration is the design, installation, commissioning, operation, coordination, maintenance, and, eventually, the decommissioning of the LAGO Observatory.
+
+### c. The LAGO Data Management Plan (DMP) and the FAIR paradigm
+To guarantee the long-term sustainability of LAGO, it is mandatory to accomplish the FAIR paradigm, i.e., to assure the Findability, Accessibility, Interoperability, and Reusability of its digital assets. The LAGO Data Management Plan, hereinafter referred to as “LAGO DMP” or simply “DMP”,  is a living document that will be amended, improved and detailed along the project evolution timeline, and it is used to establish the format of the LAGO data and metadata sets, and to describe how they are generated, stored, accessed, and used internally or externally used. The LAGO DMP is publicly available at https://lagoproject.github.io/DMP/
+
+### d. The LAGO Datasets
+During its normal operation and the different maintenance modes of the LAGO network, LAGO produces datasets containing different types of data, hereinafter collectively referred to as “the LAGO data” and individually as “a LAGO dataset”. All the LAGO datasets follow standardized schemes based on linked data as described in our DMP. 
+Any LAGO dataset could be considered within one of these categories:
+
+#### i. Measured data (Ln)
+Corresponds to any type of data that was measured in a LAGO site, including measurements of any type of radiation, atmospheric conditions, geomagnetic, solar irradiation, telemetry, and any other type of measurement produced by the LAGO detector and its peripherals. The LAGO measured data includes also any data product derived by any means of the previously described data. All the LAGO measured datasets are hierarchically tagged with the “Ln” label, being n a sequential number, starting by 0, that indicates the level of data processing: L0 corresponds to the raw data, L1 is the first level of analysed data, etc.
+
+#### ii. Simulated data (Sn)
+A LAGO simulated dataset contains data produced by any means, that were produced by the LAGO Observatory or its members and fellows using any of the LAGO simulation tools, that are intended to emulate any physical processes. All the LAGO measured datasets are hierarchically tagged with the “Sn” label, being n a sequential number.
+
+#### iii. Metadata (MLn/MSn)
+Every LAGO metadata dataset is associated with the corresponding Ln or Sn dataset following the JSON-LD 1.1(W3C) language syntax, and a reprofiled LAGO vocabulary based on the DCAT2-AP2 standard vocabulary, as described in the corresponding section of the LAGO DMP.
+
+## B. General and specific conditions of data release and acknowledgement
+
+### a. General conditions
+The LAGO data, metadata and schema definitions are available by permission of the LAGO Collaboration as the entity in charge of the Latin American Giant Observatory. The use of any LAGO data in publications or any other scientific activity, either digital or hardcopy, must be acknowledged to The Latin American Giant Observatory as well as their authors and referenced through the corresponding PiDs.
+The use of any type of LAGO data and metadata is allowed for non-commercial purposes only, and only so long as attribution is given to the creator. Any other usage of the LAGO data without permission is strictly forbidden. The policies of the LAGO data release are defined by the LAGO Collaboration and could change at any moment. 
 
-[lagoCommonRights.jsonld](./sitesLago.jsonld) unifies the usual rights of LAGO data and metadata, following the official LAGO schema vocabulary. 
+### b. Specific conditions
 
-## How should an item be referenced?
+#### i. Measured data (Ln)
+At the moment of the writing of this document, all the measured LAGO data is non-public. Specific conditions related to the release of the LAGO measured dataset will be informed by the LAGO Collaboration in the future.
+
+#### ii. Simulated data (Sn)
+LAGO simulated data (Sn) is licenced under the Creative Commons Attribution  Non-Commercial Share Alike 4.0 International (CC BY-NC-SA 4.0) and is publicly available after an embargo period of one (1) year since the LAGO data catalogue publication at the LAGO public data repository. Any usage of the LAGO measured data should follow the general data acknowledgement and cite these references:
+
+- Christian Sarmiento-Cano, Mauricio Suárez-Durán, Rolando Calderón-Ardila, Adriana Vásquez-Ramírez, Andrei Jaimes-Motta, Luis A. Núñez, Sergio Dasso, Iván Sidelnik, Hernán Asorey, “The ARTI Framework: Cosmic Rays Atmospheric Background Simulations”, DOI:10.48550/arXiv.2010.14591
+- A. J. Rubio-Montero, R. Pagán-Muñoz, R. Mayo-García, A. Pardo-Diaz, I. Sidelnik and H. Asorey, "A Novel Cloud-Based Framework For Standardized Simulations In The Latin American Giant Observatory (LAGO)" 2021 Winter Simulation Conference (WSC), 2021, pp. 1-12, DOI:10.1109/WSC52266.2021.9715360
+
+#### iii. Medatata data (MLn/MSn)
+Measured (Ln) and Simulated (Sn) data have their own metadata, correspondingly, MLn or SLn. Every metadata dataset inherits the specific conditions, acknowledgements, and references from the corresponding LAGO Measured or Simulated dataset.
+
+## C. Disclaimer of Liability
+Neither LAGO nor contributors of data to LAGO shall be held liable for any improper or incorrect use or application of the data provided, and assume no responsibility for the use or application of the data or information derived from interpretation of the data. In no event shall the LAGO or its collaborators be liable for any direct, indirect, or incidental damage arising from the use or application of these data. This disclaimer of liability applies to any damages or injury, including but not limited to those caused by any failure of performance, error, omission, defect, delay in operation or transmission, computer virus, alteration, use, application, analysis, or interpretation of data.
+
+## D. Disclaimer of Accuracy of Data
+No warranty, expressed or implied, is made regarding the accuracy, adequacy, completeness, reliability, or usefulness of any data provided. These data are provided "as is." All warranties of any kind, expressed or implied, including but not limited to fitness for a particular use, freedom from computer viruses, and non-infringement of proprietary rights, are disclaimed.
+
+## TECHNICAL APPENDIX: how to linking this document
+
+As stated above, this document unifies the rights, disclaimers and acknolegmentes for this LAGO data and metadata release. 
+
+To accomplish the linked-data requirements, this document has associated metatada in:
+- a JSON-LD file [lagoCommonRights.jsonld](./lagoCommonRights.jsonld) 
+- a block ```<script type="application/ld+json">```, which shows the later JSON-LD in the ```<head>``` section of this HTML page.   
+
+### How should this be embarransingly referenced?
+
+- ZENODO DOI
+- lagoproject page
+- github dynamic page...
+- CURL... agains the page.
+
+### How should this be referenced for linked-data?
 
 To preserve the provenance of the linked metadata through time, the GitHub raw link of a certain release of this document must be used:
 
@@ -44,7 +112,7 @@ As a real example, the metadata´s catalog of a simulation should include the re
 ...
           },
 "@id":"/sac_60_100.0_75600_QGSII_flat",
-"@type":"Catalog",
+"@type":"Catalogue",
 ...
 "license":"https://creativecommons.org/licenses/by-nc-sa/4.0/"
 "rights":"https://raw.githubusercontent.com/lagoproject/DMP/1.1/rights/lagoCommonRights.jsonld",
@@ -57,9 +125,11 @@ As a real example, the metadata´s catalog of a simulation should include the re
 ...
 ```
 
-## Plain JSON-LD file
+#### The plain JSON-LD file
 
 ```json
 {% include_relative lagoCommonRights.jsonld %}
 ```
 
+
+

schema/lagoSchema.jsonld

@@ -26,11 +26,11 @@
    {
     "@id": "lago:Software",
     "@type": "sdo:SoftwareSourceCode",
-    "owl:equivalentClass" : "prov: SoftwareAgent",
+    "owl:equivalentClass" : "prov:SoftwareAgent",
     "dcat:subClassOf" : "Agent",
-    "_sdo:codeRepository" : { "@type" : "sdo:URL" },
-    "_sdo:runtimePlatform" : {"@type" : "lago:runtimePlatform" },
-    "seeAlso" : [ "prov: SoftwareAgent", "sdo:SoftwareSourceCode", "Agent"],
+    "sdo:codeRepository" : { "@type" : "sdo:URL" },
+    "sdo:runtimePlatform" : {"@type" : "lago:runtimePlatform" },
+    "seeAlso" : [ "prov:SoftwareAgent", "sdo:SoftwareSourceCode", "Agent"],
     "comment" : [ { "@language" : "en", "@value" : "It identifies any concrete release of software used for simulation, measure, cleaning or analysis procedures. It always refers to a COMMIT in the source code, identified with a HASH at the CVS (but, it will be needed, a compressed file, using other type of hasisng, such as MD5SUM, to guarantee its immutability). Therefore, in GitHub, the @id is the link for the COMMIT (https://api.github.com/org/repo/git/commits/COMMIT_HASH and the sdo:codeRepository will be these COMMIT but browsable for humans ( https://github.com/org/repo/tree/COMMIT_HASH). It is mandatory assign an Agent:name. However, it is optional to use sdo:runtimePlatform (redefined as lago:runtimePlatform) to point to other lago:Software on which it was executed, for example to some deployment with Docker in GitHub." },  
                   { "@language" : "es", "@value" : "Identifica una versión concreta de un software usado para simular, medir, limpiar o analizar los datos de LAGO. Se refiere siempre a un COMMIT concreto en el código fuente, identificado con un código HASH en un CVS (o bien, si no fuera posible, a un fichero comprimido, univocamente identificado con algún tipo de HASH, como MD5SUM). Por tanto, en GitHub, el @id es el link del COMMIT https://api.github.com/org/repo/git/commits/COMMIT_HASH y la propiedad sdo:codeRepository sería ese COMMIT navegable para humanos  https://github.com/org/repo/tree/COMMIT_HASH. Es obligatorio asignar un Agent:name. Pero es opcional el uso de sdo:runtimePlatform (redefinida como lago:runtimePlatform) para señalar otro lago:Software sobre el que se ejecuta, por ejemplo una integración Docker en GitHub)." } ]
     },
@@ -81,45 +81,50 @@
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
     "dcat:range": { "@id" : "xsd:float" },
+    "@default" : "0.0",
     "dcat:label": "rigidity", 
-    "comment" : [ { "@language" : "en", "@value" : "Rigidity cutoff; 0 = disabled; value in GV = enabled" },  
-                  { "@language" : "es", "@value" : "Corte de la rigidez; 0 = deshabilitado; valor en GV = habilitado" } ]
+    "comment" : [ { "@language" : "en", "@value" : "Rigidity cutoff; 0.0 = disabled; value in GV = enabled" },  
+                  { "@language" : "es", "@value" : "Corte de la rigidez; 0.0 = deshabilitado; valor en GV = habilitado" } ]
    },
    {
     "@id": "lago:tMin",
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
     "dcat:range": { "@id" : "xsd:float" },
+    "@default" : "0",
     "dcat:label": "tMin", 
-    "comment" : [ { "@language" : "en", "@value" : "Low edge of zenith angle" },  
-                  { "@language" : "es", "@value" : "Límite inferior del ángulo cenital" } ]
+    "comment" : [ { "@language" : "en", "@value" : "Low edge of zenith angle, in degrees" },  
+                  { "@language" : "es", "@value" : "Límite inferior del ángulo cenital, en grados" } ]
    },
    {
     "@id": "lago:tMax",
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
     "dcat:range": { "@id" : "xsd:float" },
+    "@default" : "90",
     "dcat:label": "tMax", 
-    "comment" : [ { "@language" : "en", "@value" : "High edge of zenith angle" },  
-                  { "@language" : "es", "@value" : "Límite superior del ángulo cenital" } ]
+    "comment" : [ { "@language" : "en", "@value" : "High edge of zenith angle, in degrees" },  
+                  { "@language" : "es", "@value" : "Límite superior del ángulo cenital, en grados" } ]
    },
    {
     "@id": "lago:lLimit",
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
     "dcat:range": { "@id" : "xsd:float" },
+    "@default" : "5",
     "dcat:label": "lLimit", 
-    "comment" : [ { "@language" : "en", "@value" : "Lower limit of the primary particle energy" },  
-                  { "@language" : "es", "@value" : "Límite inferior de la energía de las partículas primarias" } ]
+    "comment" : [ { "@language" : "en", "@value" : "Lower limit of the primary particle energy in GeV" },  
+                  { "@language" : "es", "@value" : "Límite inferior de la energía de las partículas primarias en GeV" } ]
    },
    {
     "@id": "lago:uLimit",
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
     "dcat:range": { "@id" : "xsd:float" },
+    "@default" : "1e6",
     "dcat:label": "uLimit",      
-    "comment" : [ { "@language" : "en", "@value" : "Upper limit of the primary particle energy" },  
-                  { "@language" : "es", "@value" : "Límite superior de la energía de las partículas primarias" } ]
+    "comment" : [ { "@language" : "en", "@value" : "Upper limit of the primary particle energy in GeV" },  
+                  { "@language" : "es", "@value" : "Límite superior de la energía de las partículas primarias en GeV" } ]
    },
    {
     "@id": "lago:flatArray",
@@ -165,10 +170,10 @@
     "@id": "lago:highEnergyCutsSecondaries",
     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
     "dcat:domain": { "@id" : "lago:ArtiParams" },
-    "dcat:range": { "@id" : "xsd:boolean" },
+    "dcat:range": { "@id" : "xsd:float" },
     "dcat:label": "highEnergyCutsSecondaries",
-    "@default" : false,
-    "comment" : [ { "@language" : "en", "@value" : "Enable high energy cuts for secondaries" },  
+    "@default" : "0.0",
+    "comment" : [ { "@language" : "en", "@value" : "Enable high energy cuts for secondaries; 0.0 = disabled, value in GeV = enabled" },  
                   { "@language" : "es", "@value" : "" } ]
    },  
 {"_comment" : "------ Defining installed detectors and simulated detectors, this implies estaiblishing equivalencies among measures and software parameters --------"},
@@ -198,7 +203,17 @@
      "comment" : [ { "@language" : "en", "@value" : "" },  
                    { "@language" : "es", "@value" : "" } ]
   },
-{"_comment" : "------ common properties to describe characteristics of a DetectorSite (Agent) which are included also in a lago:CorsikaInput --------"},
+{"_comment" : "------ common properties to describe characteristics of a DetectorSite (Agent), some of which are included also in a lago:CorsikaInput --------"},
+   {
+    "@id": "lago:belongsLago",
+    "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
+    "dcat:domain": { "@id" : "lago:DetectorSite" },
+    "dcat:range": { "@id" : "xsd:boolean" },
+    "@default" : false,
+    "dcat:label": "belongsLago",
+    "comment" : [ { "@language" : "en", "@value" : "" },
+                  { "@language" : "es", "@value" : "" } ]
+   },
    {
      "@id": "lago:obsLev",
      "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
@@ -228,6 +243,15 @@
     "comment" : [ { "@language" : "en", "@value" : " Components of the Earth's mag. field (MAGNET), Horizontal (bx) and Vertical (bx)" },  
                   { "@language" : "es", "@value" : "" } ]
    },
+    { 
+     "@id": "lago:bDate",
+     "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
+     "dcat:domain": { "@id" : "lago:MagnetComponents" },
+     "dcat:range": { "@id" : "xsd:date" },
+     "dcat:label": "bDate", 
+     "comment" : [ { "@language" : "en", "@value" : "The date for which the magnetic field values are calculated, in the form yyyy-mm-dd. (xsd:date)" },  
+                   { "@language" : "es", "@value" : "" } ]
+    },
     {
       "@id": "lago:bx",
       "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
@@ -246,6 +270,15 @@
       "comment" : [ { "@language" : "en", "@value" : "Vertical comp. of the Earth's mag. field (MAGNET) [downwards,muT], see values at https://www.ngdc.noaa.gov/geomag/calculators/magcalc.shtml#igrfwmm" },  
                     { "@language" : "es", "@value" : "Componente vertical del campo magnético de la Tierra (MAGNET) [downwards,muT], ver valores en https://www.ngdc.noaa.gov/geomag/calculators/magcalc.shtml#igrfwmm" } ]
     },
+    { 
+      "@id": "lago:bi",
+      "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
+      "dcat:domain": { "@id" : "lago:MagnetComponents" },
+      "dcat:range": { "@id": "xsd:decimal"},
+      "dcat:label": "bx",
+      "comment" : [ { "@language" : "en", "@value" : "" },  
+                    { "@language" : "es", "@value" : "" } ]
+    },
     {
       "@id": "lago:atmcrd",
       "@type" : [ "rdf:Property", "owl:ObjectProperty" ],
@@ -289,6 +322,40 @@
       "lago:corsikaParam" : "ARRANG",
       "comment" : [ { "@language" : "en", "@value" : "" },  
                     { "@language" : "es", "@value" : "" } ]
+    },
+   {
+    "@id" : "geometry",
+    "@type" : "geometry",
+    "dcat:domain" : [ { "@id" : "Location" },
+                      { "@id" : "lago:DetectorSite" } ],
+    "dcat:range" : { "@id": "geo:Point" },    
+    "dcat:label" : "point",
+    "seeAlso" : [ "https://www.w3.org/ns/locn#locn:geometry", 
+                  "https://www.w3.org/TR/vocab-dcat-2/#Property:location_geometry" ],
+    "comment" : [ { "@language" : "en", "@value" : ""},  
+                  { "@language" : "es", "@value" : "" } ]
+   },
+   {"_comment" : "Reiterative including geo:Point and its propierties. It is as is in W3C WGS84 vocab: http://www.w3.org/2003/01/geo/wgs84_pos#). Added for guiding/clarifying."},
+   {
+    "@id": "geo:latitude",
+    "@type":"http://www.w3.org/2001/XMLSchema#float",
+    "dcat:domain": { "@id": "geo:Point" },
+    "dcat:label" : "lat",
+    "owl:equivalentProperty" : { "@id": "sdo:GeoCoordinates#latitude" }
+   },
+   {
+    "@id": "geo:longitude",
+     "@type":"http://www.w3.org/2001/XMLSchema#float",
+     "dcat:label" : "long",
+     "dcat:domain": { "@id": "geo:Point" },
+     "owl:equivalentProperty" : { "@id": "sdo:GeoCoordinates#longitude" }
+    },
+   {
+    "@id": "geo:altitude",
+     "@type":"http://www.w3.org/2001/XMLSchema#float",
+     "dcat:label" : "alt",
+     "dcat:domain": { "@id": "geo:Point" },
+     "owl:equivalentProperty" : { "@id": "sdo:GeoCoordinates#altitude" }
     }
   ],
 "@context" : {
@@ -303,6 +370,7 @@
     "dcat" : "http://www.w3.org/ns/dcat#",
     "prov" : "http://www.w3.org/ns/prov#",
     "foaf" : "http://xmlns.com/foaf/0.1/",
-    "sdo" : "http://schema.org/"
+    "sdo" : "http://schema.org/",
+    "geo": "http://www.w3.org/2003/01/geo/wgs84_pos#"
   }
 }