diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/PhenologyModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/PhenologyModelPreprocessor.java
index 9d771d9281d9aef3a208372b90705ebacb0f8894..c21610c34565797f8aff125315239a6b61d77104 100644
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/PhenologyModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/PhenologyModelPreprocessor.java
@@ -44,21 +44,32 @@ import no.nibio.vips.util.weather.WeatherDataSourceUtil;
public class PhenologyModelPreprocessor extends ModelRunPreprocessor{
- public final Logger LOGGER = Logger.getLogger(this.getClass().getName());
- private final boolean DEBUG = false;
- private final static String MODEL_ID = "PHENOLOGYM";
- private final static String TYPE_NAME = "typeName";
- private final static String SOWING_DATE = "sowingDate";
+ public final Logger LOGGER = Logger.getLogger(this.getClass().getName());
+ private final boolean DEBUG = false;
+ private final static String MODEL_ID = "PHENOLOGYM";
+ private final static String SPECIES_NAME = "speciesName";
+ private final static String TYPE_NAME = "typeName";
+ private final static String SOWING_DATE = "sowingDate";
- //private final static String SOWING_DATA = "sowingData";
- private final static String PLANTATION_DATA = "plantationData";
- private final static String FILE_PLANTATION = "/dataset/plantationData.json";
+ private final static String PLANTATION_DATA = "plantationData";
+ private final static String FILE_PLANTATION = "/dataset/plantationData.json";
+
+ private final static String NODE_SPECIES = "species";
+ private final static String NODE_SPECIES_LATIN_NAME = "speciesLatinName";
+ private final static String NODE_BASE_TEMP = "baseTemp";
+ private final static String NODE_TYPE_NAMES = "typeNames";
+ private final static String NODE_TYPE_NAME = "typeName";
+ private final static String NODE_PHASE_INFO = "phaseInfo";
+ private final static String NODE_PHASE_NAME = "phaseName";
+ private final static String NODE_HEAT_REQ = "heatReq";
@Override
public ModelConfiguration getModelConfiguration(ForecastConfiguration configuration) throws PreprocessorException {
+ String PHENOLOGY_SPECIES_NAME = SessionControllerGetter.getForecastBean().getDeCamelizedFieldName(MODEL_ID, SPECIES_NAME);
String PHENOLOGY_TYPE_NAME = SessionControllerGetter.getForecastBean().getDeCamelizedFieldName(MODEL_ID, TYPE_NAME);
String PHENOLOGY_SOWING_DATE = SessionControllerGetter.getForecastBean().getDeCamelizedFieldName(MODEL_ID, SOWING_DATE);
+ String paramPhenologySpeciesName = null;
String paramPhenologyTypeName = null;
Date paramSowingDate = null;
@@ -99,6 +110,8 @@ public class PhenologyModelPreprocessor extends ModelRunPreprocessor{
List<WeatherObservation> observations = null;
+
+
try {
observations = wdsUtil.getWeatherObservations(
weatherStation
@@ -117,10 +130,8 @@ public class PhenologyModelPreprocessor extends ModelRunPreprocessor{
throw new PreprocessorException(ex.getMessage());
}
-
-
-
- paramPhenologyTypeName = configuration.getForecastModelConfigurationValue(PHENOLOGY_TYPE_NAME);
+ paramPhenologySpeciesName = configuration.getForecastModelConfigurationValue(PHENOLOGY_SPECIES_NAME);
+ paramPhenologyTypeName = configuration.getForecastModelConfigurationValue(PHENOLOGY_TYPE_NAME);
Collections.sort(observations);
@@ -157,33 +168,18 @@ public class PhenologyModelPreprocessor extends ModelRunPreprocessor{
LOGGER.log(Level.CONFIG, "Observations=" + observations.toString());
}
- Plant plantDBData = getConfigurationPlantation(FILE_PLANTATION,paramPhenologyTypeName);
-
- if(!plantDBData.getPlantations().isEmpty())
- {
- plant = plantDBData;
- plant.setStartDate(paramSowingDate);
+ Plant plantDBData = getConfigurationPlantation(FILE_PLANTATION,paramPhenologySpeciesName,paramPhenologyTypeName);
- }
-
- /*
- if(plantDBData.getTypeName().equals(paramPhenologyTypeName))
+ if(!plantDBData.getPlantations().isEmpty())
{
plant = plantDBData;
plant.setStartDate(paramSowingDate);
}
- */
-
- //plant.setTypeName(paramPhenologyTypeName);
- //plant.setStartDate(paramSowingDate);
-
retVal.setModelId(this.getModelId());
retVal.setConfigParameter("timeZone", timeZone.getID());
retVal.setConfigParameter("observations", observations);
- //retVal.setConfigParameter(SOWING_DATA, plant);
retVal.setConfigParameter(PLANTATION_DATA, plant);
-
return retVal;
}
@@ -315,81 +311,75 @@ public class PhenologyModelPreprocessor extends ModelRunPreprocessor{
return retVal;
}
- private Plant getConfigurationPlantation(String fileName, String strParamTypeName)
+ private Plant getConfigurationPlantation(String fileName,String strParamSpeciesName, String strParamTypeName)
{
Plant plant = new Plant();
List<Plantation> plantations = new ArrayList<Plantation>();
-
try {
BufferedInputStream inputStream = new BufferedInputStream(this.getClass().getResourceAsStream(fileName));
JsonFactory f = new MappingJsonFactory();
JsonParser jp = f.createParser(inputStream);
- JsonNode nodeSpecies = jp.readValueAsTree();
-
- JsonNode nodeTypeNames = nodeSpecies.path("typeNames");
- plant.setSpeciesLatinName(nodeSpecies.get("speciesLatinName").asText());
- plant.setBaseTemp(nodeSpecies.get("baseTemp").asDouble());
+ JsonNode all = jp.readValueAsTree();
+ JsonNode nodeAllSpecies = all.path(NODE_SPECIES);
- if(nodeTypeNames.isArray())
+ if(nodeAllSpecies.isArray())
{
- for(JsonNode nodeTypeName : nodeTypeNames)
- {
- if(nodeTypeName.get("typeName").asText().trim().equalsIgnoreCase(strParamTypeName))
- {
- plant.setTypeName(strParamTypeName);
- if(null != nodeTypeName.get("baseTemp").asText())
+ for(JsonNode nodeSpecies : nodeAllSpecies)
+ {
+ if(nodeSpecies.get(NODE_SPECIES_LATIN_NAME).asText().trim().equalsIgnoreCase(strParamSpeciesName))
+ {
+ plant.setSpeciesLatinName(nodeSpecies.get(NODE_SPECIES_LATIN_NAME).asText());
+ if(null != nodeSpecies.get(NODE_BASE_TEMP).asText())
{
- plant.setBaseTemp(nodeTypeName.get("baseTemp").asDouble());
+ plant.setBaseTemp(nodeSpecies.get(NODE_BASE_TEMP).asDouble());
}
-
- JsonNode nodeAllPhaseInfo = nodeTypeName.path("phaseInfo");
- if(nodeAllPhaseInfo.isArray())
- {
- for(JsonNode nodePhaseInfo : nodeAllPhaseInfo)
- {
- Plantation plantation = new Plantation();
- plantation.setTypeName(nodeTypeName.get("typeName").asText());
+ JsonNode nodeTypeNames = nodeSpecies.path(NODE_TYPE_NAMES);
+
+ if(nodeTypeNames.isArray())
+ {
+ for(JsonNode nodeTypeName : nodeTypeNames)
+ {
+ if(nodeTypeName.get(NODE_TYPE_NAME).asText().trim().equalsIgnoreCase(strParamTypeName))
+ {
+ plant.setTypeName(strParamTypeName);
+ if(null != nodeTypeName.get(NODE_BASE_TEMP).asText())
+ {
+ plant.setBaseTemp(nodeTypeName.get(NODE_BASE_TEMP).asDouble());
+ }
+ JsonNode nodeAllPhaseInfo = nodeTypeName.path(NODE_PHASE_INFO);
+ if(nodeAllPhaseInfo.isArray())
+ {
+ for(JsonNode nodePhaseInfo : nodeAllPhaseInfo)
+ {
+ Plantation plantation = new Plantation();
+ plantation.setTypeName(nodeTypeName.get(NODE_TYPE_NAME).asText());
- plantation.setPhaseName(nodePhaseInfo.get("phaseName").asText());
- plantation.setHeatReq(nodePhaseInfo.get("heatReq").asDouble());
-
- plantations.add(plantation);
- }
- }
-
- }
-
- }
-
- }
-
-
- /*
- JsonNode nodePhaseInfo = nodeSpecies.path("phaseInfo");
- plant.setSpeciesLatinName(nodeSpecies.get("speciesLatinName").asText());
- plant.setTypeName(nodeSpecies.get("typeName").asText());
- plant.setBaseTemp(nodeSpecies.get("baseTemp").asDouble());
-
- if(nodePhaseInfo.isArray())
- {
- for(JsonNode node : nodePhaseInfo)
- {
- Plantation plantation = new Plantation
- ( nodeSpecies.get("typeName").asText()
- , node.get("phaseName").asText()
- , node.get("heatReq").asDouble()
- );
- plantations.add(plantation);
+ plantation.setPhaseName(nodePhaseInfo.get(NODE_PHASE_NAME).asText());
+ plantation.setHeatReq(nodePhaseInfo.get(NODE_HEAT_REQ).asDouble());
+
+ plantations.add(plantation);
+ }
+
+ }
+ }
+
+ }
+
+ }
+
+
+ }
}
+
}
- */
+
plant.setPlantations(plantations);
diff --git a/src/main/java/no/nibio/vips/logic/util/Plant.java b/src/main/java/no/nibio/vips/logic/util/Plant.java
index 780e67e49ef173ee65a1f9d3e92eb18ca12caee2..26aa3a3e1dc1333630930c25fc85a127a4859864 100644
--- a/src/main/java/no/nibio/vips/logic/util/Plant.java
+++ b/src/main/java/no/nibio/vips/logic/util/Plant.java
@@ -56,5 +56,10 @@ public class Plant {
public void setPlantations(List<Plantation> plantations) {
this.plantations = plantations;
}
+
+ @Override
+ public String toString() {
+ return "Plant{" + "speciesLatinName=" + speciesLatinName + ", typeName=" + typeName + ", baseTemp=" + baseTemp + ", startDate=" + startDate + ", plantations=" + plantations + '}';
+ }
}
diff --git a/src/main/java/no/nibio/vips/logic/util/Plantation.java b/src/main/java/no/nibio/vips/logic/util/Plantation.java
index 42fd0febb1d13e22f21840fd90eb1b85f16eb2e7..25215eeabd5a79a1b04f36c3bc00f8e8f4a60310 100644
--- a/src/main/java/no/nibio/vips/logic/util/Plantation.java
+++ b/src/main/java/no/nibio/vips/logic/util/Plantation.java
@@ -12,9 +12,7 @@ import java.util.Date;
public class Plantation {
private String typeName;
private String phaseName;
- //private String baseTemp;
private Double heatReq;
- //private Date startDate;
public Plantation() {
}
diff --git a/src/main/resources/dataset/plantationData.json b/src/main/resources/dataset/plantationData.json
index f23f3078a6e5df11cb0ce33a58e286ab69aa8aae..8531fcf664ffbbf0aff2104408c7c54521c7a691 100644
--- a/src/main/resources/dataset/plantationData.json
+++ b/src/main/resources/dataset/plantationData.json
@@ -1,56 +1,61 @@
{
- "speciesLatinName" : "Zea mays",
- "baseTemp" : "10",
- "typeNames" :
- [
- {
- "typeName" : "TESTVARIETY 2",
- "baseTemp" : "10",
- "phaseInfo":
+ "species":
[
{
- "phaseName": "VE",
- "heatReq" : "66.67"
- },
- {
- "phaseName": "V2",
- "heatReq" : "111.11"
- },
- {
- "phaseName": "V3",
- "heatReq" : "194.44"
- },
- {
- "phaseName": "V4-V6",
- "heatReq" : "263.89"
- },
- {
- "phaseName": "V7-V9",
- "heatReq" : "338.89"
- },
- {
- "phaseName": "V10",
- "heatReq" : "411.11"
- },
- {
- "phaseName": "VT",
- "heatReq" : "630.55"
- },
- {
- "phaseName": "R2",
- "heatReq" : "922.22"
- },
- {
- "phaseName": "R5",
- "heatReq" : "1361.11"
- },
- {
- "phaseName": "R6",
- "heatReq" : "1500"
+ "speciesLatinName" : "Zea mays",
+ "baseTemp" : "10",
+ "typeNames" :
+ [
+ {
+ "typeName" : "TESTVARIETY 2",
+ "baseTemp" : "10",
+ "phaseInfo" :
+ [
+ {
+ "phaseName": "VE",
+ "heatReq" : "66.67"
+ },
+ {
+ "phaseName": "V2",
+ "heatReq" : "111.11"
+ },
+ {
+ "phaseName": "V3",
+ "heatReq" : "194.44"
+ },
+ {
+ "phaseName": "V4-V6",
+ "heatReq" : "263.89"
+ },
+ {
+ "phaseName": "V7-V9",
+ "heatReq" : "338.89"
+ },
+ {
+ "phaseName": "V10",
+ "heatReq" : "411.11"
+ },
+ {
+ "phaseName": "VT",
+ "heatReq" : "630.55"
+ },
+ {
+ "phaseName": "R2",
+ "heatReq" : "922.22"
+ },
+ {
+ "phaseName": "R5",
+ "heatReq" : "1361.11"
+ },
+ {
+ "phaseName": "R6",
+ "heatReq" : "1500"
+ }
+
+ ]
+ }
+ ]
}
-
]
- }
- ]
}
\ No newline at end of file
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index d9e661de06e2c1ca818e802e2324461e5e15a65e..6be1dd87c07689dafd29a31f895291fe6153c966 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -497,3 +497,5 @@ sprayingDate04=Spraying Date 04
PHENOLOGYM=Phenology Model
maizeVarity=Maize Variety
sowingDate=Sowing Date
+speciesName=Species Name
+typeName=Type/Variety Name
\ No newline at end of file
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index f6165d5907ceca1c8490165f15488a775f5b4069..b2dd4efad29f860f5dac0b82eadc2034f065c265 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -495,3 +495,5 @@ sprayingDate01=Dato for spr\u00f8yting #1
sprayingDate02=Dato for spr\u00f8yting #2
sprayingDate03=Dato for spr\u00f8yting #3
sprayingDate04=Dato for spr\u00f8yting #4
+speciesName=Species Name
+typeName=Type/Variety Name
\ No newline at end of file
diff --git a/src/main/webapp/formdefinitions/models/PHENOLOGYM.json b/src/main/webapp/formdefinitions/models/PHENOLOGYM.json
index bfe8a9fd96fbfbc58e85e8b7ab364fc8de10d7e1..d5abdac4e0c03a99075ad087a06363012d7d3bea 100644
--- a/src/main/webapp/formdefinitions/models/PHENOLOGYM.json
+++ b/src/main/webapp/formdefinitions/models/PHENOLOGYM.json
@@ -18,6 +18,16 @@
],
"_comment" : "Structure of the specific fields for FAWPHENOLO",
"fields": [
+ {
+ "name" : "speciesName",
+ "dataType" : "STRING",
+ "fieldType" : "SELECT_SINGLE",
+ "required" : false,
+ "required" : true,
+ "selectOptions": [
+ {"value":"Zea mays", "label":{"en":"Zea mays","nb":"Zea mays"}, "selected":"true"}
+ ]
+ },
{
"name" : "typeName",
"dataType" : "STRING",