fiftyone-devicedetection-onpremise 4.5.0a32__tar.gz → 4.5.0a34__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a32
+Version: 4.5.0a34
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h

@@ -187,6 +187,7 @@ MAP_TYPE(KeyValuePairArray)
 MAP_TYPE(IpType)
 MAP_TYPE(IpAddress)
 MAP_TYPE(WkbtotResult)
+MAP_TYPE(WkbtotReductionMode)
 
 #define ProfileGetOffsetForProfileId fiftyoneDegreesProfileGetOffsetForProfileId /**< Synonym for #fiftyoneDegreesProfileGetOffsetForProfileId function. */
 #define OverrideValuesAdd fiftyoneDegreesOverrideValuesAdd /**< Synonym for #fiftyoneDegreesOverrideValuesAdd function. */
@@ -471,11 +472,13 @@ MAP_TYPE(WkbtotResult)
 #define INVALID_INPUT FIFTYONE_DEGREES_STATUS_INVALID_INPUT /**< Synonym for #FIFTYONE_DEGREES_STATUS_INVALID_INPUT status code.*/
 #define UNSUPPORTED_STORED_VALUE_TYPE FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE /**< Synonym for #FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE status code.*/
 #define FILE_TOO_LARGE FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE /**< Synonym for #FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE status code.*/
-#define IPV6_LENGTH FIFTYONE_DEGREES_IPV6_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV6_LENGTH status code.*/
-#define IPV4_LENGTH FIFTYONE_DEGREES_IPV4_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV4_LENGTH status code.*/
-#define IP_TYPE_IPV4 FIFTYONE_DEGREES_IP_TYPE_IPV4 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV4 status code.*/
-#define IP_TYPE_IPV6 FIFTYONE_DEGREES_IP_TYPE_IPV6 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV6 status code.*/
-#define IP_TYPE_INVALID FIFTYONE_DEGREES_IP_TYPE_INVALID /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_INVALID status code.*/
+#define UNKNOWN_GEOMETRY FIFTYONE_DEGREES_STATUS_UNKNOWN_GEOMETRY /**< Synonym for #FIFTYONE_DEGREES_STATUS_UNKNOWN_GEOMETRY status code.*/
+#define RESERVED_GEOMETRY FIFTYONE_DEGREES_STATUS_RESERVED_GEOMETRY /**< Synonym for #FIFTYONE_DEGREES_STATUS_RESERVED_GEOMETRY status code.*/
+#define IPV6_LENGTH FIFTYONE_DEGREES_IPV6_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV6_LENGTH macro.*/
+#define IPV4_LENGTH FIFTYONE_DEGREES_IPV4_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV4_LENGTH macro.*/
+#define IP_TYPE_IPV4 FIFTYONE_DEGREES_IP_TYPE_IPV4 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV4 enum value.*/
+#define IP_TYPE_IPV6 FIFTYONE_DEGREES_IP_TYPE_IPV6 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV6 enum value.*/
+#define IP_TYPE_INVALID FIFTYONE_DEGREES_IP_TYPE_INVALID /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_INVALID enum value.*/
 
  /**
  * @}

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/propertyValueType.h

@@ -37,6 +37,20 @@ typedef enum e_fiftyone_degrees_property_value_type {
 	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_COORDINATE = 7, /**< Coordinate */
 	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_IP_ADDRESS = 8, /**< Ip Range */
 	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB = 9, /**< Well-known binary for geometry */
+	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_OBJECT = 10, /**<  Mainly this is used for nested AspectData. */
+	/**
+	 * Angle north (positive) or south (negative) of the [celestial] equator,
+	 * [-90;90] saved as short (int16_t),
+	 * i.e. projected onto [-INT16_MAX;INT16_MAX]
+	 */
+	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION = 11,
+	/**
+	 * Horizontal angle from a cardinal direction (e.g. 0 meridian),
+	 * [-180;180] saved as short (int16_t),
+	 * i.e. projected onto [-INT16_MAX;INT16_MAX]
+	 */
+	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH = 12,
+	FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB_R = 13, /**< Well-known binary (reduced) for geometry */
 } fiftyoneDegreesPropertyValueType;
 
 #endif

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/status.c

@@ -42,9 +42,16 @@ static StatusMessage messages[] = {
 	{ FILE_NOT_FOUND,
 		"The data file '%s' could not be found. Check the file path and that "
 		"the program has sufficient read permissions." },
+	{ FILE_BUSY,
+		"The data file '%s' was busy." },
 	{ FILE_FAILURE,
 		"An unknown error occurred accessing the file '%s'. Check the file "
 		"path and that the program has sufficient read permissions." },
+	// `NOT_SET` should NOT return a value.
+	// See `Status.Get_NotSetMessage` unit test.
+	//
+	// { NOT_SET,
+	// 	"This status code should never be returned to the caller." },
 	{ NULL_POINTER,
 		"Null pointer to the existing dataset or memory location." },
 	{ POINTER_OUT_OF_BOUNDS,
@@ -100,18 +107,18 @@ static StatusMessage messages[] = {
 		"The configuration provided was not valid, and has caused a failure "
 		"while building the resource it configures." },
 	{ INSUFFICIENT_HANDLES,
-		"Insufficient handles available in the pool. Verify the pool has " 
+		"Insufficient handles available in the pool. Verify the pool has "
 		"sufficient handles to support the maximum number of concurrent "
 		"threads. This can be set when creating the resource containg the "
 		"pool. Another way to avoid this is by using an in-memory "
 		"configuration, which avoids using file handles completely, and "
 		"removes any limit on concurrency. For info see "
 		"https://51degrees.com/documentation/4.4/_device_detection__features__concurrent_processing.html"},
-	{ COLLECTION_INDEX_OUT_OF_RANGE, 
+	{ COLLECTION_INDEX_OUT_OF_RANGE,
 		"Index used to retrieve an item from a collection was out of range." },
-	{ COLLECTION_OFFSET_OUT_OF_RANGE, 
+	{ COLLECTION_OFFSET_OUT_OF_RANGE,
 		"Offset used to retrieve an item from a collection was out of range." },
-	{ COLLECTION_FILE_SEEK_FAIL, 
+	{ COLLECTION_FILE_SEEK_FAIL,
 		"A seek operation on a file ('%s') failed." },
 	{ COLLECTION_FILE_READ_FAIL,
 		"A read operation on a file ('%s') failed." },
@@ -121,8 +128,13 @@ static StatusMessage messages[] = {
 		"associated input data is also consistent." },
 	{ TEMP_FILE_ERROR,
 		"Error occurs during the creation of a temporary file."},
+	{ INSUFFICIENT_CAPACITY,
+		"Insufficient capacity of the array to hold all the items."},
     { INVALID_INPUT, "The input value is invalid: misformatted or semantically inconsistent."},
     { UNSUPPORTED_STORED_VALUE_TYPE, "Property's StoredValueType is not supported at this version."},
+    { FILE_TOO_LARGE, "File size exceeds malloc capabilities."},
+    { UNKNOWN_GEOMETRY, "Unsupported geometry type found in WKB."},
+    { RESERVED_GEOMETRY, "Geometry type found in WKB is abstract or reserved."},
 };
 
 static char defaultMessage[] = "Status code %i does not have any message text.";

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/status.h

@@ -145,6 +145,8 @@ typedef enum e_fiftyone_degrees_status_code {
 	FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE, /**< StoredValueType
 											is not supported at this version. */
 	FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE, /**< File size exceeds malloc capabilities */
+	FIFTYONE_DEGREES_STATUS_UNKNOWN_GEOMETRY, /**< Unsupported geometry type found in WKB */
+	FIFTYONE_DEGREES_STATUS_RESERVED_GEOMETRY, /**< Geometry type found in WKB is abstract/reserved */
 } fiftyoneDegreesStatusCode;
 
 /**

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/storedBinaryValue.c

@@ -41,6 +41,12 @@ static uint32_t getFinalIntegerSize(void *initial) {
 #	endif
     return sizeof(int32_t);
 }
+static uint32_t getFinalShortSize(void *initial) {
+#	ifdef _MSC_VER
+    UNREFERENCED_PARAMETER(initial);
+#	endif
+    return sizeof(int16_t);
+}
 
 #ifndef FIFTYONE_DEGREES_MEMORY_ONLY
 
@@ -87,6 +93,17 @@ void* fiftyoneDegreesStoredBinaryValueRead(
                 getFinalIntegerSize,
                 exception);
         }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH:
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
+            return CollectionReadFileVariable(
+                file,
+                data,
+                offset,
+                &length,
+                0,
+                getFinalShortSize,
+                exception);
+        }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
             return CollectionReadFileVariable(
                 file,
@@ -98,6 +115,7 @@ void* fiftyoneDegreesStoredBinaryValueRead(
                 exception);
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_IP_ADDRESS:
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB_R:
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB: {
             return CollectionReadFileVariable(
                 file,
@@ -237,6 +255,7 @@ static int compareIpAddressToString(const VarLengthByteArray * const value, cons
 
 static int compareWkbToString(
     const VarLengthByteArray * const binaryValue,
+    const WkbtotReductionMode reductionMode,
     const char * const target,
     Exception * const exception) {
     WkbtotResult toWktResult = {
@@ -257,6 +276,7 @@ static int compareWkbToString(
         StringBuilderInit(&builder);
         WriteWkbAsWktToStringBuilder(
             &binaryValue->firstByte,
+            reductionMode,
             MAX_DOUBLE_DECIMAL_PLACES,
             &builder,
             exception
@@ -278,6 +298,7 @@ static int compareWkbToString(
         StringBuilderInit(&builder);
         WriteWkbAsWktToStringBuilder(
             &binaryValue->firstByte,
+            reductionMode,
             MAX_DOUBLE_DECIMAL_PLACES,
             &builder,
             exception
@@ -294,6 +315,33 @@ static int compareWkbToString(
     return result;
 }
 
+static double shortToDouble(const StoredBinaryValue * const value, const double maxAngle) {
+    return (value->shortValue * maxAngle) / INT16_MAX;
+}
+static double toAzimuth(const StoredBinaryValue * const value) {
+    return shortToDouble(value, 180);
+}
+static double toDeclination(const StoredBinaryValue * const value) {
+    return shortToDouble(value, 90);
+}
+static double toDoubleFromFloat(const StoredBinaryValue * const value) {
+    return FLOAT_TO_NATIVE(value->floatValue);
+}
+
+static int compareDoubleToString(
+    const double testedValue,
+    const char * const target) {
+
+    const double searchValue = (float)strtod(target, NULL);
+    if (errno == ERANGE)
+    {
+        errno = 0;
+        return -1;
+    }
+    const double dv = testedValue - searchValue;
+    return !dv ? 0 : (dv < 0 ? -1 : 1);
+}
+
 int fiftyoneDegreesStoredBinaryValueCompareWithString(
     const StoredBinaryValue * const value,
     const PropertyValueType storedValueType,
@@ -318,11 +366,22 @@ int fiftyoneDegreesStoredBinaryValueCompareWithString(
             return compareIpAddressToString(&value->byteArrayValue, target);
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB: {
-            return compareWkbToString(&value->byteArrayValue, target, exception);
+            return compareWkbToString(
+                &value->byteArrayValue,
+                FIFTYONE_DEGREES_WKBToT_REDUCTION_NONE,
+                target,
+                exception);
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB_R: {
+            return compareWkbToString(
+                &value->byteArrayValue,
+                FIFTYONE_DEGREES_WKBToT_REDUCTION_SHORT,
+                target,
+                exception);
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_INTEGER: {
             const int32_t intValue = value->intValue;
-            const int32_t searchInt = strtol(target, NULL, 10);
+            const int32_t searchInt = (int32_t) strtol(target, NULL, 10);
             if (errno == ERANGE)
             {
                 errno = 0;
@@ -331,16 +390,13 @@ int fiftyoneDegreesStoredBinaryValueCompareWithString(
             return intValue - searchInt;
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
-            const float floatValue = fiftyoneDegreesFloatToNative(
-                *(fiftyoneDegreesFloatInternal *)&value->floatValue);
-            const float searchFloat = (float)strtod(target, NULL);
-            if (errno == ERANGE)
-            {
-                errno = 0;
-                return -1;
-            }
-            const float dv = floatValue - searchFloat;
-            return !dv ? 0 : (dv < 0 ? -1 : 1);
+            return compareDoubleToString(toDoubleFromFloat(value), target);
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH: {
+            return compareDoubleToString(toAzimuth(value), target);
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
+            return compareDoubleToString(toDeclination(value), target);
         }
         default: {
             EXCEPTION_SET(UNSUPPORTED_STORED_VALUE_TYPE);
@@ -365,6 +421,12 @@ int fiftyoneDegreesStoredBinaryValueToIntOrDefault(
         case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
             return (int)FLOAT_TO_NATIVE(value->floatValue);
         }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH: {
+            return (int)toAzimuth(value);
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
+            return (int)toDeclination(value);
+        }
         default: {
             return defaultValue;
         }
@@ -386,6 +448,12 @@ double fiftyoneDegreesStoredBinaryValueToDoubleOrDefault(
         case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
             return FLOAT_TO_NATIVE(value->floatValue);
         }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH: {
+            return toAzimuth(value);
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
+            return toDeclination(value);
+        }
         default: {
             return defaultValue;
         }
@@ -405,10 +473,16 @@ bool fiftyoneDegreesStoredBinaryValueToBoolOrDefault(
             return !strncmp(&value->stringValue.value, "True", 4);
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_INTEGER: {
-            return value->intValue;
+            return value->intValue ? true : false;
         }
         case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
-            return FLOAT_TO_NATIVE(value->floatValue);
+            return FLOAT_TO_NATIVE(value->floatValue) ? true : false;
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH: {
+            return toAzimuth(value) ? true : false;
+        }
+        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
+            return toDeclination(value) ? true : false;
         }
         default: {
             return defaultValue;

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/storedBinaryValue.h

@@ -83,6 +83,7 @@ typedef union fiftyone_degrees_stored_binary_value_t {
  fiftyoneDegreesVarLengthByteArray byteArrayValue; /**< Byte array value (e.g. IP or WKB) */
  fiftyoneDegreesFloat floatValue; /**< single precision floating point value */
  int32_t intValue; /**< Integer value */
+ int16_t shortValue; /**< Short value. Potentially half(-precision float). */
 } fiftyoneDegreesStoredBinaryValue;
 #pragma pack(pop)
 

{fiftyone_devicedetection_onpremise-4.5.0a32 → fiftyone_devicedetection_onpremise-4.5.0a34}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/stringBuilder.c

@@ -270,6 +270,16 @@ StringBuilder* fiftyoneDegreesStringBuilderAddStringValue(
 		case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB: {
 			fiftyoneDegreesWriteWkbAsWktToStringBuilder(
 				&value->byteArrayValue.firstByte,
+				FIFTYONE_DEGREES_WKBToT_REDUCTION_NONE,
+				decimalPlaces,
+				builder,
+				exception);
+			break;
+		}
+		case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB_R: {
+			fiftyoneDegreesWriteWkbAsWktToStringBuilder(
+				&value->byteArrayValue.firstByte,
+				FIFTYONE_DEGREES_WKBToT_REDUCTION_SHORT,
 				decimalPlaces,
 				builder,
 				exception);
@@ -285,10 +295,15 @@ StringBuilder* fiftyoneDegreesStringBuilderAddStringValue(
 			}
 			break;
 		}
+		case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH:
+		case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION:
 		case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
 			StringBuilderAddDouble(
 				builder,
-				FLOAT_TO_NATIVE(value->floatValue),
+				StoredBinaryValueToDoubleOrDefault(
+					value,
+					valueType,
+					0),
 				decimalPlaces);
 			break;
 		}