Merge pull request #1109 from nehaniua/Dev-2.0

dxf to pdf changes, bye laws values configuration, upyog logo updated in report, carpet area removed

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/AdditionalFeature.java

@@ -80,7 +80,7 @@ public class AdditionalFeature extends FeatureProcess {
 
     private static final String RULE_38 = "38";
     private static final String RULE_39 = "39";
-    private static final String RULE_41_I_A = "41-i-a";
+    private static final String RULE = "4.4.4";
     private static final String RULE_41_I_B = "41-i-b";
     private static final String RULE_47 = "47";
     private static final String RULE_50 = "50";
@@ -609,7 +609,7 @@ private void validatePlinthHeight(Plan pl, HashMap<String, String> errors) {
 
             if (errors.isEmpty()) {
                 Map<String, String> details = new HashMap<>();
-                details.put(RULE_NO, RULE_41_I_A);
+                details.put(RULE_NO, RULE);
                 details.put(DESCRIPTION, MIN_PLINTH_HEIGHT_DESC);
                 details.put(PERMISSIBLE, MIN_PLINTH_HEIGHT);
                 details.put(PROVIDED, String.valueOf(minPlinthHeight));

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/Coverage.java

@@ -107,7 +107,7 @@ public class Coverage extends FeatureProcess {
 
 	public static final String RULE_38 = "38";
 	public static final String RULE_7_C_1 = "Table 7-C-1";
-	public static final String RULE_18_9 = "Table 18-9";
+	public static final String RULE = "4.4.4";
 	private static final BigDecimal ROAD_WIDTH_TWELVE_POINTTWO = BigDecimal.valueOf(12.2);
 	private static final BigDecimal ROAD_WIDTH_THIRTY_POINTFIVE = BigDecimal.valueOf(30.5);
 
@@ -264,7 +264,7 @@ private BigDecimal getPermissibleCoverageForResidential(BigDecimal plotArea) {
         } else if (plotArea.compareTo(BigDecimal.valueOf(300)) > 0 && plotArea.compareTo(BigDecimal.valueOf(500)) <= 0) {
             permissibleCoverage =  BigDecimal.valueOf(60); // 60% coverage for plot area 300-500 sqm
           //  Log.info("permissibleCoverage: for plotare: "+plotArea +"is: "+ permissibleCoverage);
-        } else if (plotArea.compareTo(BigDecimal.valueOf(500)) > 0 && plotArea.compareTo(BigDecimal.valueOf(100)) <= 0) {
+        } else if (plotArea.compareTo(BigDecimal.valueOf(500)) > 0 && plotArea.compareTo(BigDecimal.valueOf(1000)) <= 0) {
             permissibleCoverage =  BigDecimal.valueOf(50); // 50% coverage for plot area 500-1000 sqm
            // Log.info("permissibleCoverage: for plotare: "+plotArea +"is: "+ permissibleCoverage);
         } else {
@@ -352,7 +352,7 @@ private void processCoverage(Plan pl, String occupancy, BigDecimal coverage, Big
 		if (coverage.doubleValue() <= upperLimit.doubleValue() || occupancy.equalsIgnoreCase("Residential")
 				|| occupancy.equalsIgnoreCase("Mercantile / Commercial")) {
 			Map<String, String> details = new HashMap<>();
-			details.put(RULE_NO, RULE_18_9);
+			details.put(RULE_NO, RULE);
 		//	details.put(DEVELOPMENT_ZONE, developmentZone);
 
 			details.put(OCCUPANCY, occupancy);
@@ -369,7 +369,7 @@ private void processCoverage(Plan pl, String occupancy, BigDecimal coverage, Big
 
 		} else {
 			Map<String, String> details = new HashMap<>();
-			details.put(RULE_NO, RULE_18_9);
+			details.put(RULE_NO, RULE);
 		//	details.put(DEVELOPMENT_ZONE, developmentZone);
 			details.put(OCCUPANCY, occupancy);
 			details.put(PERMISSIBLE, expectedResult);

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/Far.java

@@ -126,7 +126,7 @@ public class Far extends FeatureProcess {
 	private static final String VALIDATION_NEGATIVE_BUILTUP_AREA = "msg.error.negative.builtuparea.occupancy.floor";
 	private static final String VALIDATION_NEGATIVE_EXISTING_BUILTUP_AREA = "msg.error.negative.existing.builtuparea.occupancy.floor";
 	public static final String RULE_31_1 = "31-1";
-	public static final String RULE_38 = "38";
+	public static final String RULE = "4.4.4";
 
 	private static final BigDecimal POINTTWO = BigDecimal.valueOf(0.2);
 	private static final BigDecimal POINTFOUR = BigDecimal.valueOf(0.4);
@@ -1306,7 +1306,7 @@ private void buildResult(Plan pl, String occupancyName, BigDecimal far, String t
 		String actualResult = far.toString();
 
 		Map<String, String> details = new HashMap<>();
-		details.put(RULE_NO, RULE_38);
+		details.put(RULE_NO, RULE);
 		details.put(OCCUPANCY, occupancyName);
 		details.put(AREA_TYPE, typeOfArea);
 		details.put(ROAD_WIDTH, roadWidth.toString());

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/FrontYardService.java

@@ -92,7 +92,7 @@ public class FrontYardService extends GeneralRule {
 	private static final String RULE_37_TWO_G = "37-2-G";
 	private static final String RULE_37_TWO_H = "37-2-H";
 	private static final String RULE_37_TWO_I = "37-2-I";
-	private static final String RULE_47 = "47";
+	private static final String RULE = "4.4.4";
 
 	private static final String MINIMUMLABEL = "Minimum distance ";
 
@@ -290,7 +290,7 @@ private Boolean checkFrontYardResidentialCommon(Plan pl, Building building, Stri
 			OccupancyTypeHelper mostRestrictiveOccupancy, FrontYardResult frontYardResult,
 			HashMap<String, String> errors) {
 		Boolean valid = false;
-		String subRule = RULE_35;
+		String subRule = RULE;
 		String rule = FRONT_YARD_DESC;
 		BigDecimal meanVal = BigDecimal.ZERO;
 		BigDecimal depthOfPlot = pl.getPlanInformation().getDepthOfPlot();
@@ -391,7 +391,7 @@ private Boolean checkFrontYardUptoSixteenMts(SetBack setback, Building building,
 			OccupancyTypeHelper mostRestrictiveOccupancy, FrontYardResult frontYardResult,
 			HashMap<String, String> errors) {
 		Boolean valid = false;
-		String subRule = RULE_35;
+		String subRule = RULE;
 		String rule = FRONT_YARD_DESC;
 		BigDecimal minVal = BigDecimal.ZERO;
 		BigDecimal meanVal = BigDecimal.ZERO;
@@ -594,7 +594,7 @@ private Boolean checkFrontYardBasement(Plan plan, Building building, String bloc
 			String frontYardFieldName, BigDecimal min, BigDecimal mean, OccupancyTypeHelper mostRestrictiveOccupancy,
 			FrontYardResult frontYardResult) {
 		Boolean valid = false;
-		String subRule = RULE_47;
+		String subRule = RULE;
 		String rule = FRONT_YARD_DESC;
 		BigDecimal minVal = BigDecimal.ZERO;
 		BigDecimal meanVal = BigDecimal.ZERO;

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/GeneralStair.java

@@ -29,7 +29,7 @@
 public class GeneralStair extends FeatureProcess {
     private static final Logger LOG = LogManager.getLogger(GeneralStair.class);
     private static final String FLOOR = "Floor";
-    private static final String RULE42_5_II = "42-5-ii";
+    private static final String RULE = "4.4.4";
     private static final String EXPECTED_NO_OF_RISER = "12";
     private static final String NO_OF_RISER_DESCRIPTION = "Maximum no of risers required per flight for general stair %s flight %s";
     private static final String WIDTH_DESCRIPTION = "Minimum width for general stair %s flight %s";
@@ -193,14 +193,14 @@ private void validateLanding(Plan plan, Block block, ScrutinyDetail scrutinyDeta
                         : " floor " + floor.getNumber();
 
                 if (valid) {
-                    setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                    setReportOutputDetailsFloorStairWise(plan, RULE, value,
                             String.format(WIDTH_LANDING_DESCRIPTION, generalStair.getNumber(),
                                     landing.getNumber()),
                             minimumWidth.toString(),
                             String.valueOf(minWidth), Result.Accepted.getResultVal(),
                             scrutinyDetailLanding);
                 } else {
-                    setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                    setReportOutputDetailsFloorStairWise(plan, RULE, value,
                             String.format(WIDTH_LANDING_DESCRIPTION, generalStair.getNumber(),
                                     landing.getNumber()),
                             minimumWidth.toString(),
@@ -327,11 +327,11 @@ private BigDecimal validateWidth(Plan plan, ScrutinyDetail scrutinyDetail2, Floo
                     : " floor " + floor.getNumber();
 
             if (valid) {
-                setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                setReportOutputDetailsFloorStairWise(plan, RULE, value,
                         String.format(WIDTH_DESCRIPTION, generalStair.getNumber(), flight.getNumber()), minimumWidth.toString(),
                         String.valueOf(minFlightWidth), Result.Accepted.getResultVal(), scrutinyDetail2);
             } else {
-                setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                setReportOutputDetailsFloorStairWise(plan, RULE, value,
                         String.format(WIDTH_DESCRIPTION, generalStair.getNumber(), flight.getNumber()), minimumWidth.toString(),
                         String.valueOf(minFlightWidth), Result.Not_Accepted.getResultVal(), scrutinyDetail2);
             }
@@ -414,12 +414,12 @@ private BigDecimal validateTread(Plan plan, HashMap<String, String> errors, Bloc
                             ? (String) typicalFloorValues.get("typicalFloors")
                             : " floor " + floor.getNumber();
                     if (valid) {
-                        setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                        setReportOutputDetailsFloorStairWise(plan, RULE, value,
                                 String.format(TREAD_DESCRIPTION, generalStair.getNumber(), flight.getNumber()),
                                 requiredTread.toString(),
                                 String.valueOf(minTread), Result.Accepted.getResultVal(), scrutinyDetail3);
                     } else {
-                        setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                        setReportOutputDetailsFloorStairWise(plan, RULE, value,
                                 String.format(TREAD_DESCRIPTION, generalStair.getNumber(), flight.getNumber()),
                                 requiredTread.toString(),
                                 String.valueOf(minTread), Result.Not_Accepted.getResultVal(), scrutinyDetail3);
@@ -465,12 +465,12 @@ private void validateNoOfRises(Plan plan, HashMap<String, String> errors, Block
                     ? (String) typicalFloorValues.get("typicalFloors")
                     : " floor " + floor.getNumber();
             if (valid) {
-                setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                setReportOutputDetailsFloorStairWise(plan, RULE, value,
                         String.format(NO_OF_RISER_DESCRIPTION, generalStair.getNumber(), flight.getNumber()),
                         EXPECTED_NO_OF_RISER,
                         String.valueOf(noOfRises), Result.Accepted.getResultVal(), scrutinyDetail3);
             } else {
-                setReportOutputDetailsFloorStairWise(plan, RULE42_5_II, value,
+                setReportOutputDetailsFloorStairWise(plan, RULE, value,
                         String.format(NO_OF_RISER_DESCRIPTION, generalStair.getNumber(), flight.getNumber()),
                         EXPECTED_NO_OF_RISER,
                         String.valueOf(noOfRises), Result.Not_Accepted.getResultVal(), scrutinyDetail3);

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/HeightOfRoom.java

@@ -79,11 +79,11 @@
 @Service
 public class HeightOfRoom extends FeatureProcess {
 
-    private static final String SUBRULE_41_II_A = "41-ii-a";
+    private static final String RULE = "4.4.4";
     private static final String SUBRULE_41_II_B = "41-ii-b";
 
-    private static final String SUBRULE_41_II_A_AC_DESC = "Minimum height of ac room";
-    private static final String SUBRULE_41_II_A_REGULAR_DESC = "Minimum height of regular room";
+    private static final String RULE_AC_DESC = "Minimum height of ac room";
+    private static final String RULE_REGULAR_DESC = "Minimum height of regular room";
     private static final String SUBRULE_41_II_B_AREA_DESC = "Total area of rooms";
     private static final String SUBRULE_41_II_B_TOTAL_WIDTH = "Minimum Width of room";
 
@@ -202,8 +202,8 @@ else if(G.equalsIgnoreCase(mostRestrictiveOccupancy.getType().getCode()))
 //                                    else
 //                                        minimumHeight = MINIMUM_HEIGHT_3;
 
-                                    subRule = SUBRULE_41_II_A;
-                                    subRuleDesc = SUBRULE_41_II_A_AC_DESC;
+                                    subRule = RULE;
+                                    subRuleDesc = RULE_AC_DESC;
 
 
                                     boolean valid = false;
@@ -279,8 +279,8 @@ else if(G.equalsIgnoreCase(mostRestrictiveOccupancy.getType().getCode()))
 //                                    else
 //                                        minimumHeight = MINIMUM_HEIGHT_3_6;
 
-                                    subRule = SUBRULE_41_II_A;
-                                    subRuleDesc = SUBRULE_41_II_A_REGULAR_DESC;
+                                    subRule = RULE;
+                                    subRuleDesc = RULE_REGULAR_DESC;
 
 
                                     boolean valid = false;

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/LocationPlan.java

@@ -63,7 +63,7 @@
 public class LocationPlan extends FeatureProcess {
 
 	private static final Logger LOG = LogManager.getLogger(LocationPlan.class);
-	private static final String RULE_5_4_I_A = "5-4-i-a ";
+	private static final String RULE = "4.4.4";
 	public static final String LOCATION_PLAN_DESCRIPTION = "Location Plan";
 
 	@Override
@@ -84,7 +84,7 @@ public Plan process(Plan pl) {
 
 		HashMap<String, String> errors = new HashMap<>();
 		Map<String, String> details = new HashMap<>();
-		details.put(RULE_NO, RULE_5_4_I_A);
+		details.put(RULE_NO, RULE);
 		details.put(DESCRIPTION, LOCATION_PLAN_DESCRIPTION);
 		if (pl.getDrawingPreference().getLocationPlans() == null) {
 			errors.put("LOCATION_PLAN", "LOCATION_PLAN layer is not provided");

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/NorthDirection.java

@@ -64,7 +64,7 @@
 public class NorthDirection extends FeatureProcess {
 
 	private static final Logger LOG = LogManager.getLogger(NorthDirection.class);
-	private static final String RULE_5_4_I_I = "5-4-i-i";
+	private static final String RULE = "4.4.4";
 	public static final String NORTH_DIRECTION_DESCRIPTION = "North Direction";
 
 	@Override
@@ -85,7 +85,7 @@ public Plan process(Plan pl) {
 
 		HashMap<String, String> errors = new HashMap<>();
 		Map<String, String> details = new HashMap<>();
-		details.put(RULE_NO, RULE_5_4_I_I);
+		details.put(RULE_NO, RULE);
 		details.put(DESCRIPTION, NORTH_DIRECTION_DESCRIPTION);
 		if (pl.getDrawingPreference().getNorthDirection() == null) {
 			errors.put("NORTH_DIRECTION", "NORTH_DIRECTION layer is not provided");

edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/Parking.java

@@ -106,7 +106,7 @@ public class Parking extends FeatureProcess {
     private static final String SUB_RULE_34_1_DESCRIPTION = "Parking Slots Area";
     private static final String SUB_RULE_34_2 = "34-2";
     private static final String SUB_RULE_40_8 = "40-8";
-    private static final String SUB_RULE_40_11 = "40-11";
+    private static final String RULE = "Table 4.4.4";
     private static final String PARKING_MIN_AREA = "5 M x 2 M";
     private static final double PARKING_SLOT_WIDTH = 2;
     private static final double PARKING_SLOT_HEIGHT = 5;
@@ -126,8 +126,8 @@ public class Parking extends FeatureProcess {
     private static final double PARK_F = 0.30;
     private static final double PARK_VISITOR = 0.15;
     private static final String SUB_RULE_40 = "40";
-    private static final String SUB_RULE_40_2 = "40-2";
-    private static final String SUB_RULE_40_2_DESCRIPTION = "Parking space";
+    private static final String RULE_ = "4.4.4";
+    private static final String RULE__DESCRIPTION = "Parking space";
     private static final String SUB_RULE_40_10 = "40-10";
     private static final String SUB_RULE_40_10_DESCRIPTION = "Visitor’s Parking";
     public static final String OPEN_PARKING_DIM_DESC = "Open parking ECS dimension ";
@@ -380,13 +380,13 @@ else  if (stiltParkingArea.doubleValue() > 0) {
         //checkDimensionForTwoWheelerParking(pl, helper);
        //  checkAreaForLoadUnloadSpaces(pl);
         if (totalProvidedCarParkArea.doubleValue() == 0) {
-            pl.addError(SUB_RULE_40_2_DESCRIPTION,
-                    getLocaleMessage("msg.error.not.defined", SUB_RULE_40_2_DESCRIPTION));
+            pl.addError(RULE__DESCRIPTION,
+                    getLocaleMessage("msg.error.not.defined", RULE__DESCRIPTION));
         } else if (requiredCarParkArea > 0 && totalProvidedCarParkingArea.compareTo(requiredCarParkingArea) < 0) {
-            setReportOutputDetails(pl, SUB_RULE_40_2, SUB_RULE_40_2_DESCRIPTION, requiredCarParkingArea + SQMTRS,
+            setReportOutputDetails(pl, RULE_, RULE__DESCRIPTION, requiredCarParkingArea + SQMTRS,
                     totalProvidedCarParkingArea + SQMTRS, Result.Not_Accepted.getResultVal());
         } else {
-            setReportOutputDetails(pl, SUB_RULE_40_2, SUB_RULE_40_2_DESCRIPTION, requiredCarParkingArea + SQMTRS,
+            setReportOutputDetails(pl, RULE_, RULE__DESCRIPTION, requiredCarParkingArea + SQMTRS,
                     totalProvidedCarParkingArea + SQMTRS, Result.Accepted.getResultVal());
         }
         if (requiredVisitorParkArea > 0 && providedVisitorParkArea.compareTo(requiredVisitorParkingArea) < 0) {
@@ -437,16 +437,16 @@ private void validateSpecialParking(Plan pl, ParkingHelper helper, BigDecimal to
         if (maxHeightOfBuilding.compareTo(new BigDecimal(15)) >= 0
                 || (pl.getPlot() != null && pl.getPlot().getArea().compareTo(new BigDecimal(500)) > 0)) {
             if (pl.getParkingDetails().getValidSpecialSlots() == 0) {
-                pl.addError(SUB_RULE_40_11, getLocaleMessage(DcrConstants.OBJECTNOTDEFINED, SP_PARKING));
+                pl.addError(RULE, getLocaleMessage(DcrConstants.OBJECTNOTDEFINED, SP_PARKING));
             } else {
                 for (Measurement m : pl.getParkingDetails().getSpecial()) {
                     if (m.getMinimumSide().compareTo(new BigDecimal(0)) > 0
                             && m.getMinimumSide().compareTo(new BigDecimal(3.6)) >= 0) {
-                        setReportOutputDetails(pl, SUB_RULE_40_11, SP_PARKING, 1 + NUMBERS,
+                        setReportOutputDetails(pl, RULE, SP_PARKING, 1 + NUMBERS,
                                 pl.getParkingDetails().getValidSpecialSlots() + NUMBERS,
                                 Result.Accepted.getResultVal());
                     } else if (m.getMinimumSide().compareTo(new BigDecimal(0)) > 0) {
-                        setReportOutputDetails(pl, SUB_RULE_40_11, SP_PARKING, 1 + NUMBERS,
+                        setReportOutputDetails(pl, RULE, SP_PARKING, 1 + NUMBERS,
                                 pl.getParkingDetails().getValidSpecialSlots() + NUMBERS,
                                 Result.Not_Accepted.getResultVal());
                     }